From 97495195802a11f88916a86dd381fb1477b78cbe Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 11 Dec 2015 23:58:38 +0500 Subject: Multiple UI Improvements --- .../user_settings/custom_theme_chooser.jsx | 22 ++++++++++ web/react/utils/constants.jsx | 46 ++++++++++----------- web/sass-files/sass/partials/_docs.scss | 19 +++++++++ web/sass-files/sass/partials/_popover.scss | 4 ++ web/sass-files/sass/styles.scss | 3 ++ .../images/themes/code_themes/githubLarge.png | Bin 0 -> 83246 bytes .../images/themes/code_themes/monokaiLarge.png | Bin 0 -> 82658 bytes .../themes/code_themes/solarized_darkLarge.png | Bin 0 -> 81942 bytes .../themes/code_themes/solarized_lightLarge.png | Bin 0 -> 82868 bytes web/templates/docs.html | 2 +- 10 files changed, 72 insertions(+), 24 deletions(-) create mode 100644 web/sass-files/sass/partials/_docs.scss create mode 100644 web/static/images/themes/code_themes/githubLarge.png create mode 100644 web/static/images/themes/code_themes/monokaiLarge.png create mode 100644 web/static/images/themes/code_themes/solarized_darkLarge.png create mode 100644 web/static/images/themes/code_themes/solarized_lightLarge.png (limited to 'web') diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 35f836adb..778c74c23 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -3,6 +3,9 @@ import Constants from '../../utils/constants.jsx'; +const OverlayTrigger = ReactBootstrap.OverlayTrigger; +const Popover = ReactBootstrap.Popover; + export default class CustomThemeChooser extends React.Component { constructor(props) { super(props); @@ -72,6 +75,19 @@ export default class CustomThemeChooser extends React.Component { ); }); + var popoverContent = ( + + + + ); + elements.push(
{codeThemeOptions} + +
); diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index d23c18b5d..5f027a409 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -166,29 +166,6 @@ export default { UPDATE_TYPING_MS: 5000, THEMES: { default: { - type: 'Mattermost', - sidebarBg: '#fafafa', - sidebarText: '#333333', - sidebarUnreadText: '#333333', - sidebarTextHoverBg: '#e6f2fa', - sidebarTextActiveBorder: '#378FD2', - sidebarTextActiveColor: '#111111', - sidebarHeaderBg: '#2389d7', - sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#7DBE00', - mentionBj: '#2389d7', - mentionColor: '#ffffff', - centerChannelBg: '#ffffff', - centerChannelColor: '#333333', - newMessageSeparator: '#FF8800', - linkColor: '#2389d7', - buttonBg: '#2389d7', - buttonColor: '#FFFFFF', - mentionHighlightBg: '#fff2bb', - mentionHighlightLink: '#2f81b7', - codeTheme: 'github' - }, - organization: { type: 'Organization', sidebarBg: '#2071a7', sidebarText: '#fff', @@ -211,6 +188,29 @@ export default { mentionHighlightLink: '#2f81b7', codeTheme: 'github' }, + mattermost: { + type: 'Mattermost', + sidebarBg: '#fafafa', + sidebarText: '#333333', + sidebarUnreadText: '#333333', + sidebarTextHoverBg: '#e6f2fa', + sidebarTextActiveBorder: '#378FD2', + sidebarTextActiveColor: '#111111', + sidebarHeaderBg: '#2389d7', + sidebarHeaderTextColor: '#ffffff', + onlineIndicator: '#7DBE00', + mentionBj: '#2389d7', + mentionColor: '#ffffff', + centerChannelBg: '#ffffff', + centerChannelColor: '#333333', + newMessageSeparator: '#FF8800', + linkColor: '#2389d7', + buttonBg: '#2389d7', + buttonColor: '#FFFFFF', + mentionHighlightBg: '#fff2bb', + mentionHighlightLink: '#2f81b7', + codeTheme: 'github' + }, mattermostDark: { type: 'Mattermost Dark', sidebarBg: '#1B2C3E', diff --git a/web/sass-files/sass/partials/_docs.scss b/web/sass-files/sass/partials/_docs.scss new file mode 100644 index 000000000..6c21055d5 --- /dev/null +++ b/web/sass-files/sass/partials/_docs.scss @@ -0,0 +1,19 @@ +@charset "UTF-8"; + +.docks__page { + line-height: 1.7; + padding-bottom: 20px; + + > div { + width: 1170px; + margin: 0 auto; + padding: 0 15px; + max-width: 100%; + } + + h1.markdown__heading { + border-bottom: 1px solid #ddd; + padding-bottom: 1rem; + margin: 1em 0 1em; + } +} \ No newline at end of file diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss index bc55b7ff7..1ae07fe5b 100644 --- a/web/sass-files/sass/partials/_popover.scss +++ b/web/sass-files/sass/partials/_popover.scss @@ -10,6 +10,10 @@ display: inline-block; } +.code-popover .popover-content { + padding: 5px; +} + .user-popover__image { margin: 0 0 10px; @include border-radius(128px); diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index c93372175..7bf3574d2 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -49,6 +49,9 @@ // Responsive Css @import "partials/responsive"; +// Docs Css +@import "partials/docs"; + // Standalone Css @import "partials/oauth"; diff --git a/web/static/images/themes/code_themes/githubLarge.png b/web/static/images/themes/code_themes/githubLarge.png new file mode 100644 index 000000000..cffc6e012 Binary files /dev/null and b/web/static/images/themes/code_themes/githubLarge.png differ diff --git a/web/static/images/themes/code_themes/monokaiLarge.png b/web/static/images/themes/code_themes/monokaiLarge.png new file mode 100644 index 000000000..7224950af Binary files /dev/null and b/web/static/images/themes/code_themes/monokaiLarge.png differ diff --git a/web/static/images/themes/code_themes/solarized_darkLarge.png b/web/static/images/themes/code_themes/solarized_darkLarge.png new file mode 100644 index 000000000..582df48f9 Binary files /dev/null and b/web/static/images/themes/code_themes/solarized_darkLarge.png differ diff --git a/web/static/images/themes/code_themes/solarized_lightLarge.png b/web/static/images/themes/code_themes/solarized_lightLarge.png new file mode 100644 index 000000000..d2c2702fb Binary files /dev/null and b/web/static/images/themes/code_themes/solarized_lightLarge.png differ diff --git a/web/templates/docs.html b/web/templates/docs.html index 21659e810..2ec6ce818 100644 --- a/web/templates/docs.html +++ b/web/templates/docs.html @@ -7,7 +7,7 @@
-
+
-- cgit v1.2.3-1-g7c22