From fafac3b4128a0993b0de1c6e8ca3062bf1ccc14e Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Thu, 8 Dec 2016 16:59:09 +0100 Subject: Revert "[#801] Merge branch 'signup'" This reverts commit d10f607a4d40587510b0dc31b31fe4750bf4a3a3, reversing changes made to c28abba2f5b1186c671ebef508d40ffaae6d5bc5. --- web-ui/app/scss/base/_colors.scss | 64 ++++++++++++++++++++++++++++++++ web-ui/app/scss/base/_fonts.scss | 68 ++++++++++++++++++++++++++++++++++ web-ui/app/scss/base/_scaffolding.scss | 10 +++++ 3 files changed, 142 insertions(+) create mode 100644 web-ui/app/scss/base/_colors.scss create mode 100644 web-ui/app/scss/base/_fonts.scss create mode 100644 web-ui/app/scss/base/_scaffolding.scss (limited to 'web-ui/app/scss/base') diff --git a/web-ui/app/scss/base/_colors.scss b/web-ui/app/scss/base/_colors.scss new file mode 100644 index 00000000..17333ff9 --- /dev/null +++ b/web-ui/app/scss/base/_colors.scss @@ -0,0 +1,64 @@ +/* Pixelated Color Palette - don't change these! */ +$dark_slate_gray: #3E3A37; +$light_gray: #C2C2C2; +$lighter_blue: #91C2D1; +$light_blue: #3DABC4; +$dark_blue: #178CA6; +$bullet-blue: #5cacde; +$light_orange: #FF9C00; +$dark_orange: #FF7902; + + +/* Side nav background color */ +$navigation_background: $dark_slate_gray; + +/* Action buttons and links */ +$action_buttons: $light_blue; + +/* Primary Highlight*/ +$primary_highlight: $light_orange; + +/* Logo color*/ +$logo_color: $light_orange; + +/* Unread count dialog bubble background color */ +$secondary_callout: darken($primary_highlight, 5); + +/* Grayscale */ +$contrast: #EEE; +$white: #FFF; +$dark_white: #FAFAFA; +$lighter_gray: #DDD; +$medium_light_grey: #999; +$medium_grey: #777; +$medium_dark_grey: #666; +$dark_grey: #333; +$black: #000; +$top_pane: $contrast; +$total_count_bg: #C0B9B9; +$background_dropdown_grey: #f0f0f0; + +$background_light_grey: #F5F5F5; +$border_light_grey: #D9D9D9; + +/* Feedback to Users */ +$warning: #F7E8AF; +$search-highlight: #FFEF29; + +/* Light gray indicator icons */ +$indicator_icon_color: $light_gray; + +$error: #D93C38; +$attention: #F6A41C; +$success: #50BA5B; + +$will_be_encrypted: $success; +$wont_be_encrypted: $attention; +$recipients_font_color: #828282; + +/* Attachments */ +$attachment_text: #555; +$attachment_icon: lighten($attachment_text, 30); +$attachment_size: lighten($attachment_text, 30); +$attachment_area_background: #F5F5F5; +$attachment_area_border: #D9D9D9; diff --git a/web-ui/app/scss/base/_fonts.scss b/web-ui/app/scss/base/_fonts.scss new file mode 100644 index 00000000..dfc56dd8 --- /dev/null +++ b/web-ui/app/scss/base/_fonts.scss @@ -0,0 +1,68 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), url('/assets/fonts/OpenSans-Light.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), url('/assets/fonts/OpenSans.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('/assets/fonts/OpenSans-Semibold.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url('/assets/fonts/OpenSans-Bold.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 800; + src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url('/assets/fonts/OpenSans-Extrabold.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url('/assets/fonts/OpenSansLight-Italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), url('/assets/fonts/OpenSans-Italic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url('/assets/fonts/OpenSans-SemiboldItalic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url('/assets/fonts/OpenSans-BoldItalic.woff') format('woff'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 800; + src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url('/assets/fonts/OpenSans-ExtraboldItalic.woff') format('woff'); +} + +@font-face { + font-family: 'icomoon'; + font-style: normal; + font-weight: 400; + src: url('/assets/fonts/icomoon.woff') format('woff'), url('/assets/fonts/icomoon.ttf') format('truetype'), ; +} + diff --git a/web-ui/app/scss/base/_scaffolding.scss b/web-ui/app/scss/base/_scaffolding.scss new file mode 100644 index 00000000..b8b5fa3b --- /dev/null +++ b/web-ui/app/scss/base/_scaffolding.scss @@ -0,0 +1,10 @@ +html { + height: 100% ; +} + +body { + min-height: 100% ; + overflow: hidden; + background: $white; +} + -- cgit v1.2.3