summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-06-05 18:13:12 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-13 17:58:17 -0400
commit35339bb11f2c410b91a5e8b9ae1d2fef19cac695 (patch)
tree8e415cd273e33abc18851a86da206c1646c56872
parent0e21436aaf9ea2ed988c3e515e0db73df70534c4 (diff)
downloadgitlab-ce-35339bb11f2c410b91a5e8b9ae1d2fef19cac695.tar.gz
Update markup/styling for syntax highlight theme preference
-rw-r--r--app/assets/stylesheets/pages/profiles/preferences.scss12
-rw-r--r--app/views/profiles/preferences/show.html.haml4
2 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss
index e8c80362817..e5859fe7384 100644
--- a/app/assets/stylesheets/pages/profiles/preferences.scss
+++ b/app/assets/stylesheets/pages/profiles/preferences.scss
@@ -37,22 +37,20 @@
}
}
-.code_highlight_opts {
- margin-top: 10px;
-
+.syntax-theme {
label {
margin-right: 20px;
text-align: center;
- .prev {
- width: 160px;
+ .preview {
margin-bottom: 10px;
+ width: 160px;
img {
- max-width: 100%;
@include border-radius(4px);
+
+ max-width: 100%;
}
}
}
}
-
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index bfce0d8ef96..680c0930bba 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -16,9 +16,9 @@
= f.radio_button :theme_id, theme.id
= theme.name
- .panel.panel-default.code-preview-theme
+ .panel.panel-default.syntax-theme
.panel-heading
- Code preview theme
+ Syntax highlighting theme
.panel-body
- color_schemes.each do |color_scheme_id, color_scheme|
= label_tag do