summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-11-05 10:43:20 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-11-05 10:43:20 +0500
commit9bf832f9f32a1171b2250ed99caa3a3553e877e2 (patch)
tree5b8c234d97e5a572c8de9dbe609c7a94434637e3
parent11ccb14fd46daf76bbde67c39c349ee742788b45 (diff)
downloadchat-9bf832f9f32a1171b2250ed99caa3a3553e877e2.tar.gz
chat-9bf832f9f32a1171b2250ed99caa3a3553e877e2.tar.bz2
chat-9bf832f9f32a1171b2250ed99caa3a3553e877e2.zip
Updating code themes
-rw-r--r--web/react/components/user_settings/custom_theme_chooser.jsx10
-rw-r--r--web/sass-files/sass/partials/_settings.scss9
-rw-r--r--web/static/images/themes/code_themes/github.pngbin9648 -> 18321 bytes
-rw-r--r--web/static/images/themes/code_themes/monokai.pngbin9303 -> 18119 bytes
-rw-r--r--web/static/images/themes/code_themes/solarized_dark.pngbin8172 -> 17856 bytes
-rw-r--r--web/static/images/themes/code_themes/solarized_light.pngbin8860 -> 17934 bytes
6 files changed, 15 insertions, 4 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 986b0b2fd..895d0c500 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -76,7 +76,7 @@ export default class CustomThemeChooser extends React.Component {
>
<label className='custom-label'>{element.uiName}</label>
<div
- className='input-group dropdown'
+ className='input-group theme-group dropdown'
id={element.id}
>
<select
@@ -87,9 +87,11 @@ export default class CustomThemeChooser extends React.Component {
>
{codeThemeOptions}
</select>
- <img
- src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'}
- />
+ <span className='input-group-addon'>
+ <img
+ src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'}
+ />
+ </span>
</div>
</div>
);
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 3be83ed2f..b304450bc 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -125,6 +125,15 @@
}
.appearance-section {
+ .theme-group {
+ .input-group-addon {
+ padding: 4px 5px;
+ width: 40px;
+ img {
+ border: 1px solid rgba(black, 0.15);
+ }
+ }
+ }
.premade-themes {
margin-bottom: 10px;
.theme-label {
diff --git a/web/static/images/themes/code_themes/github.png b/web/static/images/themes/code_themes/github.png
index d0538d6c0..a49b877b1 100644
--- a/web/static/images/themes/code_themes/github.png
+++ b/web/static/images/themes/code_themes/github.png
Binary files differ
diff --git a/web/static/images/themes/code_themes/monokai.png b/web/static/images/themes/code_themes/monokai.png
index 8f92d2a18..a71225b68 100644
--- a/web/static/images/themes/code_themes/monokai.png
+++ b/web/static/images/themes/code_themes/monokai.png
Binary files differ
diff --git a/web/static/images/themes/code_themes/solarized_dark.png b/web/static/images/themes/code_themes/solarized_dark.png
index 76055c678..07774ff20 100644
--- a/web/static/images/themes/code_themes/solarized_dark.png
+++ b/web/static/images/themes/code_themes/solarized_dark.png
Binary files differ
diff --git a/web/static/images/themes/code_themes/solarized_light.png b/web/static/images/themes/code_themes/solarized_light.png
index b9595c22d..fc71dbb87 100644
--- a/web/static/images/themes/code_themes/solarized_light.png
+++ b/web/static/images/themes/code_themes/solarized_light.png
Binary files differ