From fe84def81748495a897c5772a09d1fb4bf0790f2 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 15 Dec 2015 21:12:19 +0500 Subject: Multiple UI Improvements --- web/react/components/sidebar.jsx | 8 + .../user_settings/custom_theme_chooser.jsx | 2 +- web/react/utils/utils.jsx | 2 +- web/sass-files/sass/partials/_search.scss | 5 + web/sass-files/sass/partials/_sidebar--left.scss | 10 + web/static/css/google-fonts.css | 13 + web/static/fonts/lato-italic-webfont.eot | Bin 0 -> 25808 bytes web/static/fonts/lato-italic-webfont.svg | 4072 ++++++++++++++++++++ web/static/fonts/lato-italic-webfont.ttf | Bin 0 -> 46212 bytes web/static/fonts/lato-italic-webfont.woff | Bin 0 -> 28332 bytes web/static/fonts/lato-italic-webfont.woff2 | Bin 0 -> 22792 bytes web/static/images/themes/code_themes/github.png | Bin 18321 -> 83246 bytes .../images/themes/code_themes/githubLarge.png | Bin 83246 -> 0 bytes web/static/images/themes/code_themes/monokai.png | Bin 18119 -> 82658 bytes .../images/themes/code_themes/monokaiLarge.png | Bin 82658 -> 0 bytes .../images/themes/code_themes/solarized_dark.png | Bin 17856 -> 81942 bytes .../themes/code_themes/solarized_darkLarge.png | Bin 81942 -> 0 bytes .../images/themes/code_themes/solarized_light.png | Bin 17934 -> 82868 bytes .../themes/code_themes/solarized_lightLarge.png | Bin 82868 -> 0 bytes 19 files changed, 4110 insertions(+), 2 deletions(-) create mode 100755 web/static/fonts/lato-italic-webfont.eot create mode 100755 web/static/fonts/lato-italic-webfont.svg create mode 100755 web/static/fonts/lato-italic-webfont.ttf create mode 100755 web/static/fonts/lato-italic-webfont.woff create mode 100755 web/static/fonts/lato-italic-webfont.woff2 delete mode 100644 web/static/images/themes/code_themes/githubLarge.png delete mode 100644 web/static/images/themes/code_themes/monokaiLarge.png delete mode 100644 web/static/images/themes/code_themes/solarized_darkLarge.png delete mode 100644 web/static/images/themes/code_themes/solarized_lightLarge.png diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 8393440cb..a1b93188a 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -378,6 +378,13 @@ export default class Sidebar extends React.Component { ); } + var icon = null; + if (channel.type === 'O') { + icon =
; + } else if (channel.type === 'P') { + icon =
; + } + // set up click handler to switch channels (or create a new channel for non-existant ones) var handleClick = null; var href = '#'; @@ -461,6 +468,7 @@ export default class Sidebar extends React.Component { href={href} onClick={handleClick} > + {icon} {status} {channel.display_name} {badge} diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 55242ca7f..b7d90922a 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -92,7 +92,7 @@ export default class CustomThemeChooser extends React.Component { > ); diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index fb8b89252..a98d22eaf 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -544,7 +544,7 @@ export function applyTheme(theme) { changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'color:' + theme.sidebarText, 1); changeCss('.sidebar--left .nav-pills__container li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6), 1); changeCss('.sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText, 1); - changeCss('.sidebar--left .status path', 'fill:' + changeOpacity(theme.sidebarText, 0.5), 1); + changeCss('.sidebar--left .status path', 'fill:' + theme.sidebarText, 1); changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 2); } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index eceeb9a8c..0d9d7b50d 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -33,6 +33,11 @@ line-height: 40px; display: none; } +.search-item-snippet { + ul, ol { + padding-left: 20px; + } +} .sidebar__search-icon { position: absolute; top: 15px; diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index d5bf0e503..b16ac31f7 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -42,6 +42,16 @@ margin-right: 6px; width: 12px; display: inline-block; + i, path { + @include opacity(0.5); + } + .fa-lock { + margin-left: 1px; + } + .fa-globe { + top: -1px; + position: relative; + } .online--icon { fill: #7DBE00; } diff --git a/web/static/css/google-fonts.css b/web/static/css/google-fonts.css index a9ed54d3e..fbbc717da 100644 --- a/web/static/css/google-fonts.css +++ b/web/static/css/google-fonts.css @@ -143,6 +143,19 @@ url('/static/fonts/Lato-regular.svg#Lato') format('svg'); } +/* Lato Italic */ +@font-face { + font-family: 'Lato'; + font-weight: 400; + font-style: italic; + src: url('/static/fonts/lato-italic-webfont.eot'); + src: url('/static/fonts/lato-italic-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/fonts/lato-italic-webfont.woff2') format('woff2'), + url('/static/fonts/lato-italic-webfont.woff') format('woff'), + url('/static/fonts/lato-italic-webfont.ttf') format('truetype'), + url('/static/fonts/lato-italic-webfont.svg#latoitalic') format('svg'); +} + /* Lato Bold */ @font-face { font-family: 'Lato'; diff --git a/web/static/fonts/lato-italic-webfont.eot b/web/static/fonts/lato-italic-webfont.eot new file mode 100755 index 000000000..09a973da4 Binary files /dev/null and b/web/static/fonts/lato-italic-webfont.eot differ diff --git a/web/static/fonts/lato-italic-webfont.svg b/web/static/fonts/lato-italic-webfont.svg new file mode 100755 index 000000000..1da5d3606 --- /dev/null +++ b/web/static/fonts/lato-italic-webfont.svg @@ -0,0 +1,4072 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/static/fonts/lato-italic-webfont.ttf b/web/static/fonts/lato-italic-webfont.ttf new file mode 100755 index 000000000..97dde9575 Binary files /dev/null and b/web/static/fonts/lato-italic-webfont.ttf differ diff --git a/web/static/fonts/lato-italic-webfont.woff b/web/static/fonts/lato-italic-webfont.woff new file mode 100755 index 000000000..f7fed0e86 Binary files /dev/null and b/web/static/fonts/lato-italic-webfont.woff differ diff --git a/web/static/fonts/lato-italic-webfont.woff2 b/web/static/fonts/lato-italic-webfont.woff2 new file mode 100755 index 000000000..10f062a55 Binary files /dev/null and b/web/static/fonts/lato-italic-webfont.woff2 differ diff --git a/web/static/images/themes/code_themes/github.png b/web/static/images/themes/code_themes/github.png index a49b877b1..cffc6e012 100644 Binary files a/web/static/images/themes/code_themes/github.png and b/web/static/images/themes/code_themes/github.png differ diff --git a/web/static/images/themes/code_themes/githubLarge.png b/web/static/images/themes/code_themes/githubLarge.png deleted file mode 100644 index cffc6e012..000000000 Binary files a/web/static/images/themes/code_themes/githubLarge.png and /dev/null differ diff --git a/web/static/images/themes/code_themes/monokai.png b/web/static/images/themes/code_themes/monokai.png index a71225b68..7224950af 100644 Binary files a/web/static/images/themes/code_themes/monokai.png and b/web/static/images/themes/code_themes/monokai.png differ diff --git a/web/static/images/themes/code_themes/monokaiLarge.png b/web/static/images/themes/code_themes/monokaiLarge.png deleted file mode 100644 index 7224950af..000000000 Binary files a/web/static/images/themes/code_themes/monokaiLarge.png and /dev/null differ diff --git a/web/static/images/themes/code_themes/solarized_dark.png b/web/static/images/themes/code_themes/solarized_dark.png index 07774ff20..582df48f9 100644 Binary files a/web/static/images/themes/code_themes/solarized_dark.png and b/web/static/images/themes/code_themes/solarized_dark.png differ diff --git a/web/static/images/themes/code_themes/solarized_darkLarge.png b/web/static/images/themes/code_themes/solarized_darkLarge.png deleted file mode 100644 index 582df48f9..000000000 Binary files a/web/static/images/themes/code_themes/solarized_darkLarge.png and /dev/null differ diff --git a/web/static/images/themes/code_themes/solarized_light.png b/web/static/images/themes/code_themes/solarized_light.png index fc71dbb87..d2c2702fb 100644 Binary files a/web/static/images/themes/code_themes/solarized_light.png and b/web/static/images/themes/code_themes/solarized_light.png differ diff --git a/web/static/images/themes/code_themes/solarized_lightLarge.png b/web/static/images/themes/code_themes/solarized_lightLarge.png deleted file mode 100644 index d2c2702fb..000000000 Binary files a/web/static/images/themes/code_themes/solarized_lightLarge.png and /dev/null differ -- cgit v1.2.3-1-g7c22