From 0f4235c7b1d06f98aa76c70557b26132692d6768 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 14 Jan 2016 15:35:41 -0200 Subject: [PATCH 01/31] Change setup from Foundation to Bootstrap and clear our customizations based on Foundation --- requirements/requirements.txt | 1 - sapl/settings.py | 14 +- static/styles/_settings.scss | 1485 --------------------------------- static/styles/app.scss | 433 +--------- 4 files changed, 7 insertions(+), 1926 deletions(-) delete mode 100644 static/styles/_settings.scss diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8f9d6ca6f..e0ccfbbbc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,4 +1,3 @@ -crispy-forms-foundation Django<1.9 djangorestframework django-admin-bootstrapped diff --git a/sapl/settings.py b/sapl/settings.py index e658fcfce..44d0bbd1e 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -58,7 +58,6 @@ INSTALLED_APPS = ( 'djangobower', 'bootstrap3', # basically for django_admin_bootstrapped 'crispy_forms', - 'crispy_forms_foundation', 'sass_processor', ) @@ -159,16 +158,14 @@ MEDIA_URL = '/media/' DAB_FIELD_RENDERER = \ 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer' -CRISPY_TEMPLATE_PACK = 'foundation-5' -CRISPY_ALLOWED_TEMPLATE_PACKS = 'foundation-5' +CRISPY_TEMPLATE_PACK = 'bootstrap3' +CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = not DEBUG BOWER_COMPONENTS_ROOT = BASE_DIR.child("bower") BOWER_INSTALLED_APPS = ( - 'foundation', - 'foundation-datepicker', + 'bootstrap-sass', 'components-font-awesome', - 'foundation-icon-fonts', 'tinymce', 'jquery-ui', 'jquery-runner', @@ -177,10 +174,11 @@ BOWER_INSTALLED_APPS = ( ) # Additional search paths for SASS files when using the @import statement -SASS_PROCESSOR_INCLUDE_DIRS = ( - BOWER_COMPONENTS_ROOT.child('bower_components', 'foundation', 'scss'), +SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child( + 'bower_components', 'bootstrap-sass', 'assets', 'stylesheets'), ) +# FIXME update cripy-forms and remove this # hack to suppress many annoying warnings from crispy_forms # see sapl.temp_suppress_crispy_form_warnings LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING diff --git a/static/styles/_settings.scss b/static/styles/_settings.scss deleted file mode 100644 index 3fcf083b3..000000000 --- a/static/styles/_settings.scss +++ /dev/null @@ -1,1485 +0,0 @@ -// Foundation by ZURB -// foundation.zurb.com -// Licensed under MIT Open Source - -// - -// Table of Contents -// Foundation Settings -// a. Base -// b. Grid -// c. Global -// d. Media Query Ranges -// e. Typography -// 01. Accordion -// 02. Alert Boxes -// 03. Block Grid -// 04. Breadcrumbs -// 05. Buttons -// 06. Button Groups -// 07. Clearing -// 08. Dropdown -// 09. Dropdown Buttons -// 10. Flex Video -// 11. Forms -// 12. Icon Bar -// 13. Inline Lists -// 14. Joyride -// 15. Keystrokes -// 16. Labels -// 17. Magellan -// 18. Off-canvas -// 19. Orbit -// 20. Pagination -// 21. Panels -// 22. Pricing Tables -// 23. Progress Bar -// 24. Range Slider -// 25. Reveal -// 26. Side Nav -// 27. Split Buttons -// 28. Sub Nav -// 29. Switch -// 30. Tables -// 31. Tabs -// 32. Thumbnails -// 33. Tooltips -// 34. Top Bar -// 36. Visibility Classes - -// a. Base -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// This is the default html and body font-size for the base rem value. -// $rem-base: 16px; - -// Allows the use of rem-calc() or lower-bound() in your settings -@import 'foundation/functions'; - -// The default font-size is set to 100% of the browser style sheet (usually 16px) -// for compatibility with browser-based text zoom or user-set defaults. - -// Since the typical default browser font-size is 16px, that makes the calculation for grid size. -// If you want your base font-size to be different and not have it affect the grid breakpoints, -// set $rem-base to $base-font-size and make sure $base-font-size is a px value. -// $base-font-size: 100%; - -// The $base-font-size is 100% while $base-line-height is 150% -// $base-line-height: 150%; - -// We use this to control whether or not CSS classes come through in the gem files. -$include-html-classes: true; -// $include-print-styles: true; -$include-html-global-classes: $include-html-classes; - -// b. Grid -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-grid-classes: $include-html-classes; -// $include-xl-html-grid-classes: false; - -// $row-width: rem-calc(1000); -// $total-columns: 12; -// $column-gutter: rem-calc(30); - -// c. Global -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// We use these to define default font stacks - $font-family-sans-serif: "Open Sans" "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; -// $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif; -// $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace; - -// We use these to define default font weights -// $font-weight-normal: normal; -// $font-weight-bold: bold; - -// $white : #FFFFFF; -// $ghost : #FAFAFA; -// $snow : #F9F9F9; -// $vapor : #F6F6F6; -// $white-smoke : #F5F5F5; -// $silver : #EFEFEF; -// $smoke : #EEEEEE; -// $gainsboro : #DDDDDD; -// $iron : #CCCCCC; -// $base : #AAAAAA; -// $aluminum : #999999; -// $jumbo : #888888; -// $monsoon : #777777; -// $steel : #666666; -// $charcoal : #555555; -// $tuatara : #444444; -// $oil : #333333; -// $jet : #222222; -// $black : #000000; - -// We use these as default colors throughout - $primary-color: #27AE60; - $secondary-color: #34495E; -// $alert-color: #f04124; -// $success-color: #43AC6A; -// $warning-color: #f08a24; -// $info-color: #a0d3e8; - -// We use these to control various global styles -// $body-bg: $white; -// $body-font-color: $jet; -// $body-font-family: $font-family-sans-serif; -// $body-font-weight: $font-weight-normal; -// $body-font-style: normal; - -// We use this to control font-smoothing -// $font-smoothing: antialiased; - -// We use these to control text direction settings -// $text-direction: ltr; -// $opposite-direction: right; -// $default-float: left; -// $last-child-float: $opposite-direction; - -// We use these to make sure border radius matches unless we want it different. - $global-radius: 4px; -// $global-rounded: 1000px; - -// We use these to control inset shadow shiny edges and depressions. -// $shiny-edge-size: 0 1px 0; -// $shiny-edge-color: rgba($white, .5); -// $shiny-edge-active-color: rgba($black, .2); - -// d. Media Query Ranges -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $small-breakpoint: em-calc(640); -// $medium-breakpoint: em-calc(1024); -// $large-breakpoint: em-calc(1440); -// $xlarge-breakpoint: em-calc(1920); - -// $small-range: (0, $small-breakpoint); -// $medium-range: ($small-breakpoint + em-calc(1), $medium-breakpoint); -// $large-range: ($medium-breakpoint + em-calc(1), $large-breakpoint); -// $xlarge-range: ($large-breakpoint + em-calc(1), $xlarge-breakpoint); -// $xxlarge-range: ($xlarge-breakpoint + em-calc(1), em-calc(99999999)); - -// $screen: "only screen"; - -// $landscape: "#{$screen} and (orientation: landscape)"; -// $portrait: "#{$screen} and (orientation: portrait)"; - -// $small-up: $screen; -// $small-only: "#{$screen} and (max-width: #{upper-bound($small-range)})"; - -// $medium-up: "#{$screen} and (min-width:#{lower-bound($medium-range)})"; -// $medium-only: "#{$screen} and (min-width:#{lower-bound($medium-range)}) and (max-width:#{upper-bound($medium-range)})"; - -// $large-up: "#{$screen} and (min-width:#{lower-bound($large-range)})"; -// $large-only: "#{$screen} and (min-width:#{lower-bound($large-range)}) and (max-width:#{upper-bound($large-range)})"; - -// $xlarge-up: "#{$screen} and (min-width:#{lower-bound($xlarge-range)})"; -// $xlarge-only: "#{$screen} and (min-width:#{lower-bound($xlarge-range)}) and (max-width:#{upper-bound($xlarge-range)})"; - -// $xxlarge-up: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)})"; -// $xxlarge-only: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)}) and (max-width:#{upper-bound($xxlarge-range)})"; - -// $retina: ( -// "#{$screen} and (-webkit-min-device-pixel-ratio: 2)", -// "#{$screen} and (min--moz-device-pixel-ratio: 2)", -// "#{$screen} and (-o-min-device-pixel-ratio: 2/1)", -// "#{$screen} and (min-device-pixel-ratio: 2)", -// "#{$screen} and (min-resolution: 192dpi)", -// "#{$screen} and (min-resolution: 2dppx)" -// ); - -// Legacy -// $small: $medium-up; -// $medium: $medium-up; -// $large: $large-up; - -// We use this as cursors values for enabling the option of having custom cursors in the whole site's stylesheet -// $cursor-crosshair-value: crosshair; -// $cursor-default-value: default; -// $cursor-disabled-value: not-allowed; -// $cursor-pointer-value: pointer; -// $cursor-help-value: help; -// $cursor-text-value: text; - -// e. Typography -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-type-classes: $include-html-classes; - -// We use these to control header font styles -// $header-font-family: $body-font-family; -// $header-font-weight: $font-weight-normal; -// $header-font-style: normal; -// $header-font-color: $jet; -// $header-line-height: 1.4; -// $header-top-margin: .2rem; -// $header-bottom-margin: .5rem; -// $header-text-rendering: optimizeLegibility; - -// We use these to control header font sizes -// $h1-font-size: rem-calc(44); -// $h2-font-size: rem-calc(37); -// $h3-font-size: rem-calc(27); -// $h4-font-size: rem-calc(23); -// $h5-font-size: rem-calc(18); -// $h6-font-size: 1rem; - -// We use these to control header size reduction on small screens -// $h1-font-reduction: rem-calc(10); -// $h2-font-reduction: rem-calc(10); -// $h3-font-reduction: rem-calc(5); -// $h4-font-reduction: rem-calc(5); -// $h5-font-reduction: 0; -// $h6-font-reduction: 0; - -// These control how subheaders are styled. -// $subheader-line-height: 1.4; -// $subheader-font-color: scale-color($header-font-color, $lightness: 35%); -// $subheader-font-weight: $font-weight-normal; -// $subheader-top-margin: .2rem; -// $subheader-bottom-margin: .5rem; - -// A general styling -// $small-font-size: 60%; -// $small-font-color: scale-color($header-font-color, $lightness: 35%); - -// We use these to style paragraphs -// $paragraph-font-family: inherit; -// $paragraph-font-weight: $font-weight-normal; -// $paragraph-font-size: 1rem; -// $paragraph-line-height: 1.6; -// $paragraph-margin-bottom: rem-calc(20); -// $paragraph-aside-font-size: rem-calc(14); -// $paragraph-aside-line-height: 1.35; -// $paragraph-aside-font-style: italic; -// $paragraph-text-rendering: optimizeLegibility; - -// We use these to style tags -// $code-color: $oil; -// $code-font-family: $font-family-monospace; -// $code-font-weight: $font-weight-normal; -// $code-background-color: scale-color($secondary-color, $lightness: 70%); -// $code-border-size: 1px; -// $code-border-style: solid; -// $code-border-color: scale-color($code-background-color, $lightness: -10%); -// $code-padding: rem-calc(2) rem-calc(5) rem-calc(1); - -// We use these to style anchors -// $anchor-text-decoration: none; -// $anchor-text-decoration-hover: none; -// $anchor-font-color: $primary-color; -// $anchor-font-color-hover: scale-color($anchor-font-color, $lightness: -14%); - -// We use these to style the
element -// $hr-border-width: 1px; -// $hr-border-style: solid; -// $hr-border-color: $gainsboro; -// $hr-margin: rem-calc(20); - -// We use these to style lists -// $list-font-family: $paragraph-font-family; -// $list-font-size: $paragraph-font-size; -// $list-line-height: $paragraph-line-height; -// $list-margin-bottom: $paragraph-margin-bottom; -// $list-style-position: outside; -// $list-side-margin: 1.1rem; -// $list-ordered-side-margin: 1.4rem; -// $list-side-margin-no-bullet: 0; -// $list-nested-margin: rem-calc(20); -// $definition-list-header-weight: $font-weight-bold; -// $definition-list-header-margin-bottom: .3rem; -// $definition-list-margin-bottom: rem-calc(12); - -// We use these to style blockquotes -// $blockquote-font-color: scale-color($header-font-color, $lightness: 35%); -// $blockquote-padding: rem-calc(9 20 0 19); -// $blockquote-border: 1px solid $gainsboro; -// $blockquote-cite-font-size: rem-calc(13); -// $blockquote-cite-font-color: scale-color($header-font-color, $lightness: 23%); -// $blockquote-cite-link-color: $blockquote-cite-font-color; - -// Acronym styles -// $acronym-underline: 1px dotted $gainsboro; - -// We use these to control padding and margin -// $microformat-padding: rem-calc(10 12); -// $microformat-margin: rem-calc(0 0 20 0); - -// We use these to control the border styles -// $microformat-border-width: 1px; -// $microformat-border-style: solid; -// $microformat-border-color: $gainsboro; - -// We use these to control full name font styles -// $microformat-fullname-font-weight: $font-weight-bold; -// $microformat-fullname-font-size: rem-calc(15); - -// We use this to control the summary font styles -// $microformat-summary-font-weight: $font-weight-bold; - -// We use this to control abbr padding -// $microformat-abbr-padding: rem-calc(0 1); - -// We use this to control abbr font styles -// $microformat-abbr-font-weight: $font-weight-bold; -// $microformat-abbr-font-decoration: none; - -// 01. Accordion -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-accordion-classes: $include-html-classes; - -// $accordion-navigation-padding: rem-calc(16); -// $accordion-navigation-bg-color: $silver; -// $accordion-navigation-hover-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -5%); -// $accordion-navigation-active-bg-color: scale-color($accordion-navigation-bg-color, $lightness: -3%); -// $accordion-navigation-font-color: $jet; -// $accordion-navigation-font-size: rem-calc(16); -// $accordion-navigation-font-family: $body-font-family; - -// $accordion-content-padding: ($column-gutter/2); -// $accordion-content-active-bg-color: $white; - -// 02. Alert Boxes -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-alert-classes: $include-html-classes; - -// We use this to control alert padding. -// $alert-padding-top: rem-calc(14); -// $alert-padding-default-float: $alert-padding-top; -// $alert-padding-opposite-direction: $alert-padding-top + rem-calc(10); -// $alert-padding-bottom: $alert-padding-top; - -// We use these to control text style. -// $alert-font-weight: $font-weight-normal; -// $alert-font-size: rem-calc(13); -// $alert-font-color: $white; -// $alert-font-color-alt: scale-color($secondary-color, $lightness: -66%); - -// We use this for close hover effect. -// $alert-function-factor: -14%; - -// We use these to control border styles. -// $alert-border-style: solid; -// $alert-border-width: 1px; -// $alert-border-color: scale-color($primary-color, $lightness: $alert-function-factor); -// $alert-bottom-margin: rem-calc(20); - -// We use these to style the close buttons -// $alert-close-color: $oil; -// $alert-close-top: 50%; -// $alert-close-position: rem-calc(4); -// $alert-close-font-size: rem-calc(22); -// $alert-close-opacity: .3; -// $alert-close-opacity-hover: .5; -// $alert-close-padding: 9px 6px 4px; -// $alert-close-background: inherit; - -// We use this to control border radius -// $alert-radius: $global-radius; - -// $alert-transition-speed: 300ms; -// $alert-transition-ease: ease-out; - -// 03. Block Grid -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-block-grid-classes: $include-html-classes; -// $include-xl-html-block-grid-classes: false; - -// We use this to control the maximum number of block grid elements per row -// $block-grid-elements: 12; -// $block-grid-default-spacing: rem-calc(20); - -// $align-block-grid-to-grid: false; -// @if $align-block-grid-to-grid {$block-grid-default-spacing: $column-gutter;} - -// Enables media queries for block-grid classes. Set to false if writing semantic HTML. -// $block-grid-media-queries: true; - -// 04. Breadcrumbs -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-nav-classes: $include-html-classes; - -// We use this to set the background color for the breadcrumb container. -// $crumb-bg: scale-color($secondary-color, $lightness: 55%); - -// We use these to set the padding around the breadcrumbs. -// $crumb-padding: rem-calc(9 14 9); -// $crumb-side-padding: rem-calc(12); - -// We use these to control border styles. -// $crumb-function-factor: -10%; -// $crumb-border-size: 1px; -// $crumb-border-style: solid; -// $crumb-border-color: scale-color($crumb-bg, $lightness: $crumb-function-factor); -// $crumb-radius: $global-radius; - -// We use these to set various text styles for breadcrumbs. -// $crumb-font-size: rem-calc(11); -// $crumb-font-color: $primary-color; -// $crumb-font-color-current: $oil; -// $crumb-font-color-unavailable: $aluminum; -// $crumb-font-transform: uppercase; -// $crumb-link-decor: underline; - -// We use these to control the slash between breadcrumbs -// $crumb-slash-color: $base; -// $crumb-slash: "/"; - -// 05. Buttons -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// We use these to build padding for buttons. -// $button-tny: rem-calc(10); -// $button-sml: rem-calc(14); -// $button-med: rem-calc(16); -// $button-lrg: rem-calc(18); - -// We use this to control the display property. -// $button-display: inline-block; -// $button-margin-bottom: rem-calc(20); - -// We use these to control button text styles. -// $button-font-family: $body-font-family; -// $button-font-color: $white; -// $button-font-color-alt: $oil; -// $button-font-tny: rem-calc(11); -// $button-font-sml: rem-calc(13); -// $button-font-med: rem-calc(16); -// $button-font-lrg: rem-calc(20); -// $button-font-weight: $font-weight-normal; -// $button-font-align: center; - -// We use these to control various hover effects. -// $button-function-factor: -20%; - -// We use these to control button border styles. -// $button-border-width: 0; -// $button-border-style: solid; -// $button-bg-color: $primary-color; -// $button-bg-hover: scale-color($button-bg-color, $lightness: $button-function-factor); -// $button-border-color: $button-bg-hover; -// $secondary-button-bg-hover: scale-color($secondary-color, $lightness: $button-function-factor); -// $secondary-button-border-color: $secondary-button-bg-hover; -// $success-button-bg-hover: scale-color($success-color, $lightness: $button-function-factor); -// $success-button-border-color: $success-button-bg-hover; -// $alert-button-bg-hover: scale-color($alert-color, $lightness: $button-function-factor); -// $alert-button-border-color: $alert-button-bg-hover; -// $warning-button-bg-hover: scale-color($warning-color, $lightness: $button-function-factor); -// $warning-button-border-color: $warning-button-bg-hover; -// $info-button-bg-hover: scale-color($info-color, $lightness: $button-function-factor); -// $info-button-border-color: $info-button-bg-hover; - -// We use this to set the default radius used throughout the core. -// $button-radius: $global-radius; -// $button-round: $global-rounded; - -// We use this to set default opacity and cursor for disabled buttons. -// $button-disabled-opacity: .7; -// $button-disabled-cursor: $cursor-default-value; - -// 06. Button Groups -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// Sets the margin for the right side by default, and the left margin if right-to-left direction is used -// $button-bar-margin-opposite: rem-calc(10); -// $button-group-border-width: 1px; - -// 07. Clearing -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-clearing-classes: $include-html-classes; - -// We use these to set the background colors for parts of Clearing. -// $clearing-bg: $oil; -// $clearing-caption-bg: $clearing-bg; -// $clearing-carousel-bg: rgba(51,51,51,0.8); -// $clearing-img-bg: $clearing-bg; - -// We use these to style the close button -// $clearing-close-color: $iron; -// $clearing-close-size: 30px; - -// We use these to style the arrows -// $clearing-arrow-size: 12px; -// $clearing-arrow-color: $clearing-close-color; - -// We use these to style captions -// $clearing-caption-font-color: $iron; -// $clearing-caption-font-size: .875em; -// $clearing-caption-padding: 10px 30px 20px; - -// We use these to make the image and carousel height and style -// $clearing-active-img-height: 85%; -// $clearing-carousel-height: 120px; -// $clearing-carousel-thumb-width: 120px; -// $clearing-carousel-thumb-active-border: 1px solid rgb(255,255,255); - -// 08. Dropdown -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-dropdown-classes: $include-html-classes; - -// We use these to controls height and width styles. -// $f-dropdown-max-width: 200px; -// $f-dropdown-height: auto; -// $f-dropdown-max-height: none; - -// Used for bottom position - $f-dropdown-margin-top: 0px; - -// Used for right position - $f-dropdown-margin-left: 5px; - -// Used for left position -// $f-dropdown-margin-right: $f-dropdown-margin-top; - -// Used for top position -// $f-dropdown-margin-bottom: $f-dropdown-margin-top; - -// We use this to control the background color -// $f-dropdown-bg: $white; - -// We use this to set the border styles for dropdowns. -// $f-dropdown-border-style: solid; -// $f-dropdown-border-width: 1px; -// $f-dropdown-border-color: scale-color($white, $lightness: -20%); - -// We use these to style the triangle pip. -// $f-dropdown-triangle-size: 6px; -// $f-dropdown-triangle-color: $white; -// $f-dropdown-triangle-side-offset: 10px; - -// We use these to control styles for the list elements. -// $f-dropdown-list-style: none; -// $f-dropdown-font-color: $charcoal; -// $f-dropdown-font-size: rem-calc(14); -// $f-dropdown-list-padding: rem-calc(5, 10); -// $f-dropdown-line-height: rem-calc(18); -// $f-dropdown-list-hover-bg: $smoke; -// $dropdown-mobile-default-float: 0; - -// We use this to control the styles for when the dropdown has custom content. -// $f-dropdown-content-padding: rem-calc(20); - -// Default radius for dropdown. -// $f-dropdown-radius: $global-radius; - - -// 09. Dropdown Buttons -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// We use these to set the color of the pip in dropdown buttons -// $dropdown-button-pip-color: $white; -// $dropdown-button-pip-color-alt: $oil; - -// We use these to set the size of the pip in dropdown buttons -// $button-pip-tny: rem-calc(6); -// $button-pip-sml: rem-calc(7); -// $button-pip-med: rem-calc(9); -// $button-pip-lrg: rem-calc(11); - -// We use these to style tiny dropdown buttons -// $dropdown-button-padding-tny: $button-pip-tny * 7; -// $dropdown-button-pip-size-tny: $button-pip-tny; -// $dropdown-button-pip-opposite-tny: $button-pip-tny * 3; -// $dropdown-button-pip-top-tny: (-$button-pip-tny / 2) + rem-calc(1); - -// We use these to style small dropdown buttons -// $dropdown-button-padding-sml: $button-pip-sml * 7; -// $dropdown-button-pip-size-sml: $button-pip-sml; -// $dropdown-button-pip-opposite-sml: $button-pip-sml * 3; -// $dropdown-button-pip-top-sml: (-$button-pip-sml / 2) + rem-calc(1); - -// We use these to style medium dropdown buttons -// $dropdown-button-padding-med: $button-pip-med * 6 + rem-calc(3); -// $dropdown-button-pip-size-med: $button-pip-med - rem-calc(3); -// $dropdown-button-pip-opposite-med: $button-pip-med * 2.5; -// $dropdown-button-pip-top-med: (-$button-pip-med / 2) + rem-calc(2); - -// We use these to style large dropdown buttons -// $dropdown-button-padding-lrg: $button-pip-lrg * 5 + rem-calc(3); -// $dropdown-button-pip-size-lrg: $button-pip-lrg - rem-calc(6); -// $dropdown-button-pip-opposite-lrg: $button-pip-lrg * 2.5; -// $dropdown-button-pip-top-lrg: (-$button-pip-lrg / 2) + rem-calc(3); - -// 10. Flex Video -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-media-classes: $include-html-classes; - -// We use these to control video container padding and margins -// $flex-video-padding-top: rem-calc(25); -// $flex-video-padding-bottom: 67.5%; -// $flex-video-margin-bottom: rem-calc(16); - -// We use this to control widescreen bottom padding -// $flex-video-widescreen-padding-bottom: 56.34%; - -// 11. Forms -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-form-classes: $include-html-classes; - -// We use this to set the base for lots of form spacing and positioning styles -// $form-spacing: rem-calc(16); - -// We use these to style the labels in different ways -// $form-label-pointer: pointer; -// $form-label-font-size: rem-calc(14); -// $form-label-font-weight: $font-weight-normal; -// $form-label-line-height: 1.5; -// $form-label-font-color: scale-color($black, $lightness: 30%); -// $form-label-small-transform: capitalize; -// $form-label-bottom-margin: 0; -// $input-font-family: inherit; -// $input-font-color: rgba(0,0,0,0.75); -// $input-font-size: rem-calc(14); -// $input-bg-color: $white; -// $input-focus-bg-color: scale-color($white, $lightness: -2%); -// $input-border-color: scale-color($white, $lightness: -20%); -// $input-focus-border-color: scale-color($white, $lightness: -40%); -// $input-border-style: solid; -// $input-border-width: 1px; -// $input-border-radius: $global-radius; -// $input-disabled-bg: $gainsboro; -// $input-disabled-cursor: $cursor-default-value; -// $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); -// $input-include-glowing-effect: false; - -// We use these to style the fieldset border and spacing. -// $fieldset-border-style: solid; -// $fieldset-border-width: 1px; -// $fieldset-border-color: $gainsboro; -// $fieldset-padding: rem-calc(20); -// $fieldset-margin: rem-calc(18 0); - -// We use these to style the legends when you use them -// $legend-bg: $white; -// $legend-font-weight: $font-weight-bold; -// $legend-padding: rem-calc(0 3); - -// We use these to style the prefix and postfix input elements -// $input-prefix-bg: scale-color($white, $lightness: -5%); -// $input-prefix-border-color: scale-color($white, $lightness: -20%); -// $input-prefix-border-size: 1px; -// $input-prefix-border-type: solid; -// $input-prefix-overflow: hidden; -// $input-prefix-font-color: $oil; -// $input-prefix-font-color-alt: $white; - -// We use this setting to turn on/off HTML5 number spinners (the up/down arrows) -// $input-number-spinners: true; - -// We use these to style the error states for inputs and labels -// $input-error-message-padding: rem-calc(6 9 9); -// $input-error-message-top: -1px; -// $input-error-message-font-size: rem-calc(12); -// $input-error-message-font-weight: $font-weight-normal; -// $input-error-message-font-style: italic; -// $input-error-message-font-color: $white; -// $input-error-message-bg-color: $alert-color; -// $input-error-message-font-color-alt: $oil; - -// We use this to style the glowing effect of inputs when focused -// $glowing-effect-fade-time: .45s; -// $glowing-effect-color: $input-focus-border-color; - -// We use this to style the transition when inputs are focused and when the glowing effect is disabled. -// $input-transition-fade-time: 0.15s; -// $input-transition-fade-timing-function: linear; - -// Select variables -// $select-bg-color: $ghost; -// $select-hover-bg-color: scale-color($select-bg-color, $lightness: -3%); - - -// 12. Icon Bar -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// We use these to style the icon-bar and items - $icon-bar-bg: $secondary-color; -// $icon-bar-font-color: $white; -// $icon-bar-font-color-hover: $icon-bar-font-color; -// $icon-bar-font-size: 0; - $icon-bar-hover-color: darken($secondary-color, 5%); -// $icon-bar-icon-color: $white; -// $icon-bar-icon-color-hover: $icon-bar-icon-color; -// $icon-bar-icon-size: 1rem; - $icon-bar-image-width: 1rem; - $icon-bar-image-height: 1rem; -// $icon-bar-active-color: $primary-color; - $icon-bar-item-padding: 0.75rem; - -// We use this to set default opacity and cursor for disabled icons. -// $icon-bar-disabled-opacity: .7; - -// 13. Inline Lists -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-inline-list-classes: $include-html-classes; - -// We use this to control the margins and padding of the inline list. -// $inline-list-top-margin: 0; -// $inline-list-opposite-margin: 0; -// $inline-list-bottom-margin: rem-calc(17); -// $inline-list-default-float-margin: rem-calc(-22); -// $inline-list-default-float-list-margin: rem-calc(22); - -// $inline-list-padding: 0; - -// We use this to control the overflow of the inline list. -// $inline-list-overflow: hidden; - -// We use this to control the list items -// $inline-list-display: block; - -// We use this to control any elements within list items -// $inline-list-children-display: block; - -// 14. Joyride -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-joyride-classes: $include-html-classes; - -// Controlling default Joyride styles -// $joyride-tip-bg: $oil; -// $joyride-tip-default-width: 300px; -// $joyride-tip-padding: rem-calc(18 20 24); -// $joyride-tip-border: solid 1px $charcoal; -// $joyride-tip-radius: 4px; -// $joyride-tip-position-offset: 22px; - -// Here, we're setting the tip font styles -// $joyride-tip-font-color: $white; -// $joyride-tip-font-size: rem-calc(14); -// $joyride-tip-header-weight: $font-weight-bold; - -// This changes the nub size -// $joyride-tip-nub-size: 10px; - -// This adjusts the styles for the timer when its enabled -// $joyride-tip-timer-width: 50px; -// $joyride-tip-timer-height: 3px; -// $joyride-tip-timer-color: $steel; - -// This changes up the styles for the close button -// $joyride-tip-close-color: $monsoon; -// $joyride-tip-close-size: 24px; -// $joyride-tip-close-weight: $font-weight-normal; - -// When Joyride is filling the screen, we use this style for the bg -// $joyride-screenfill: rgba(0,0,0,0.5); - -// 15. Keystrokes -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-keystroke-classes: $include-html-classes; - -// We use these to control text styles. -// $keystroke-font: "Consolas", "Menlo", "Courier", monospace; -// $keystroke-font-size: inherit; -// $keystroke-font-color: $jet; -// $keystroke-font-color-alt: $white; -// $keystroke-function-factor: -7%; - -// We use this to control keystroke padding. -// $keystroke-padding: rem-calc(2 4 0); - -// We use these to control background and border styles. -// $keystroke-bg: scale-color($white, $lightness: $keystroke-function-factor); -// $keystroke-border-style: solid; -// $keystroke-border-width: 1px; -// $keystroke-border-color: scale-color($keystroke-bg, $lightness: $keystroke-function-factor); -// $keystroke-radius: $global-radius; - -// 16. Labels -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-label-classes: $include-html-classes; - -// We use these to style the labels -// $label-padding: rem-calc(4 8 4); -// $label-radius: $global-radius; - -// We use these to style the label text -// $label-font-sizing: rem-calc(11); -// $label-font-weight: $font-weight-normal; -// $label-font-color: $oil; -// $label-font-color-alt: $white; -// $label-font-family: $body-font-family; - -// 17. Magellan -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-magellan-classes: $include-html-classes; - -// $magellan-bg: $white; -// $magellan-padding: 10px; - -// 18. Off-canvas -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// Off Canvas Tab Bar Variables -// $include-html-off-canvas-classes: $include-html-classes; - -// $tabbar-bg: $oil; -// $tabbar-height: rem-calc(45); -// $tabbar-icon-width: $tabbar-height; -// $tabbar-line-height: $tabbar-height; -// $tabbar-color: $white; -// $tabbar-middle-padding: 0 rem-calc(10); - -// Off Canvas Divider Styles -// $tabbar-left-section-border: solid 1px scale-color($tabbar-bg, $lightness: -50%); -// $tabbar-right-section-border: $tabbar-left-section-border; - - -// Off Canvas Tab Bar Headers -// $tabbar-header-color: $white; -// $tabbar-header-weight: $font-weight-bold; -// $tabbar-header-line-height: $tabbar-height; -// $tabbar-header-margin: 0; - -// Off Canvas Menu Variables -// $off-canvas-width: rem-calc(250); -// $off-canvas-bg: $oil; -// $off-canvas-bg-hover: scale-color($tabbar-bg, $lightness: -30%); -// $off-canvas-bg-active: scale-color($tabbar-bg, $lightness: -30%); - -// Off Canvas Menu List Variables -// $off-canvas-label-padding: .3rem rem-calc(15); -// $off-canvas-label-color: $aluminum; -// $off-canvas-label-text-transform: uppercase; -// $off-canvas-label-font-size: rem-calc(12); -// $off-canvas-label-font-weight: $font-weight-bold; -// $off-canvas-label-bg: $tuatara; -// $off-canvas-label-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%); -// $off-canvas-label-border-bottom: none; -// $off-canvas-label-margin:0; -// $off-canvas-link-padding: rem-calc(10, 15); -// $off-canvas-link-color: rgba($white, .7); -// $off-canvas-link-border-bottom: 1px solid scale-color($off-canvas-bg, $lightness: -25%); -// $off-canvas-back-bg: #444; -// $off-canvas-back-border-top: $off-canvas-label-border-top; -// $off-canvas-back-border-bottom: $off-canvas-label-border-bottom; -// $off-canvas-back-hover-bg: scale-color($off-canvas-back-bg, $lightness: -30%); -// $off-canvas-back-hover-border-top: 1px solid scale-color($off-canvas-label-bg, $lightness: 14%); -// $off-canvas-back-hover-border-bottom: none; - -// Off Canvas Menu Icon Variables -// $tabbar-menu-icon-color: $white; -// $tabbar-menu-icon-hover: scale-color($tabbar-menu-icon-color, $lightness: -30%); - -// $tabbar-menu-icon-text-indent: rem-calc(35); -// $tabbar-menu-icon-width: $tabbar-icon-width; -// $tabbar-menu-icon-height: $tabbar-height; -// $tabbar-menu-icon-padding: 0; - -// $tabbar-hamburger-icon-width: rem-calc(16); -// $tabbar-hamburger-icon-left: false; -// $tabbar-hamburger-icon-top: false; -// $tabbar-hamburger-icon-thickness: 1px; -// $tabbar-hamburger-icon-gap: 6px; - -// Off Canvas Back-Link Overlay -// $off-canvas-overlay-transition: background 300ms ease; -// $off-canvas-overlay-cursor: pointer; -// $off-canvas-overlay-box-shadow: -4px 0 4px rgba($black, .5), 4px 0 4px rgba($black, .5); -// $off-canvas-overlay-background: rgba($white, .2); -// $off-canvas-overlay-background-hover: rgba($white, .05); - -// Transition Variables -// $menu-slide: "transform 500ms ease"; - -// 19. Orbit -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-orbit-classes: $include-html-classes; - -// We use these to control the caption styles -// $orbit-container-bg: none; -// $orbit-caption-bg: rgba(51,51,51, .8); -// $orbit-caption-font-color: $white; -// $orbit-caption-font-size: rem-calc(14); -// $orbit-caption-position: "bottom"; // Supported values: "bottom", "under" -// $orbit-caption-padding: rem-calc(10 14); -// $orbit-caption-height: auto; - -// We use these to control the left/right nav styles -// $orbit-nav-bg: transparent; -// $orbit-nav-bg-hover: rgba(0,0,0,0.3); -// $orbit-nav-arrow-color: $white; -// $orbit-nav-arrow-color-hover: $white; - -// We use these to control the timer styles -// $orbit-timer-bg: rgba(255,255,255,0.3); -// $orbit-timer-show-progress-bar: true; - -// We use these to control the bullet nav styles -// $orbit-bullet-nav-color: $iron; -// $orbit-bullet-nav-color-active: $aluminum; -// $orbit-bullet-radius: rem-calc(9); - -// We use these to controls the style of slide numbers -// $orbit-slide-number-bg: rgba(0,0,0,0); -// $orbit-slide-number-font-color: $white; -// $orbit-slide-number-padding: rem-calc(5); - -// Graceful Loading Wrapper and preloader -// $wrapper-class: "slideshow-wrapper"; -// $preloader-class: "preloader"; - -// Hide controls on small -// $orbit-nav-hide-for-small: true; -// $orbit-bullet-hide-for-small: true; -// $orbit-timer-hide-for-small: true; - -// 20. Pagination -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-pagination-classes: $include-html-classes; - -// We use these to control the pagination container -// $pagination-height: rem-calc(24); -// $pagination-margin: rem-calc(-5); - -// We use these to set the list-item properties -// $pagination-li-float: $default-float; -// $pagination-li-height: rem-calc(24); -// $pagination-li-font-color: $jet; -// $pagination-li-font-size: rem-calc(14); -// $pagination-li-margin: rem-calc(5); - -// We use these for the pagination anchor links -// $pagination-link-pad: rem-calc(1 10 1); -// $pagination-link-font-color: $aluminum; -// $pagination-link-active-bg: scale-color($white, $lightness: -10%); - -// We use these for disabled anchor links -// $pagination-link-unavailable-cursor: default; -// $pagination-link-unavailable-font-color: $aluminum; -// $pagination-link-unavailable-bg-active: transparent; - -// We use these for currently selected anchor links -// $pagination-link-current-background: $primary-color; -// $pagination-link-current-font-color: $white; -// $pagination-link-current-font-weight: $font-weight-bold; -// $pagination-link-current-cursor: default; -// $pagination-link-current-active-bg: $primary-color; - -// 21. Panels -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-panel-classes: $include-html-classes; - -// We use these to control the background and border styles -// $panel-bg: scale-color($white, $lightness: -5%); -// $panel-border-style: solid; -// $panel-border-size: 1px; -// $callout-panel-bg: scale-color($primary-color, $lightness: 94%); - -// We use this % to control how much we darken things on hover -// $panel-border-color: scale-color($panel-bg, $lightness: -11%); - -// We use these to set default inner padding and bottom margin -// $panel-margin-bottom: rem-calc(20); -// $panel-padding: rem-calc(20); - -// We use these to set default font colors -// $panel-font-color: $oil; -// $panel-font-color-alt: $white; - -// $panel-header-adjust: true; -// $callout-panel-link-color: $primary-color; -// $callout-panel-link-color-hover: scale-color($callout-panel-link-color, $lightness: -14%); - -// 22. Pricing Tables -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-pricing-classes: $include-html-classes; - -// We use this to control the border color -// $price-table-border: solid 1px $gainsboro; - -// We use this to control the bottom margin of the pricing table -// $price-table-margin-bottom: rem-calc(20); - -// We use these to control the title styles -// $price-title-bg: $oil; -// $price-title-padding: rem-calc(15 20); -// $price-title-align: center; -// $price-title-color: $smoke; -// $price-title-weight: $font-weight-normal; -// $price-title-size: rem-calc(16); -// $price-title-font-family: $body-font-family; - -// We use these to control the price styles -// $price-money-bg: $vapor; -// $price-money-padding: rem-calc(15 20); -// $price-money-align: center; -// $price-money-color: $oil; -// $price-money-weight: $font-weight-normal; -// $price-money-size: rem-calc(32); -// $price-money-font-family: $body-font-family; - - -// We use these to control the description styles -// $price-bg: $white; -// $price-desc-color: $monsoon; -// $price-desc-padding: rem-calc(15); -// $price-desc-align: center; -// $price-desc-font-size: rem-calc(12); -// $price-desc-weight: $font-weight-normal; -// $price-desc-line-height: 1.4; -// $price-desc-bottom-border: dotted 1px $gainsboro; - -// We use these to control the list item styles -// $price-item-color: $oil; -// $price-item-padding: rem-calc(15); -// $price-item-align: center; -// $price-item-font-size: rem-calc(14); -// $price-item-weight: $font-weight-normal; -// $price-item-bottom-border: dotted 1px $gainsboro; - -// We use these to control the CTA area styles -// $price-cta-bg: $white; -// $price-cta-align: center; -// $price-cta-padding: rem-calc(20 20 0); - -// 23. Progress Bar -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-media-classes: $include-html-classes; - -// We use this to set the progress bar height -// $progress-bar-height: rem-calc(25); -// $progress-bar-color: $vapor; - -// We use these to control the border styles -// $progress-bar-border-color: scale-color($white, $lightness: 20%); -// $progress-bar-border-size: 1px; -// $progress-bar-border-style: solid; -// $progress-bar-border-radius: $global-radius; - -// We use these to control the margin & padding -// $progress-bar-margin-bottom: rem-calc(10); - -// We use these to set the meter colors -// $progress-meter-color: $primary-color; -// $progress-meter-secondary-color: $secondary-color; -// $progress-meter-success-color: $success-color; -// $progress-meter-alert-color: $alert-color; - -// 24. Range Slider -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-range-slider-classes: $include-html-classes; - -// These variables define the slider bar styles -// $range-slider-bar-width: 100%; -// $range-slider-bar-height: rem-calc(16); - -// $range-slider-bar-border-width: 1px; -// $range-slider-bar-border-style: solid; -// $range-slider-bar-border-color: $gainsboro; -// $range-slider-radius: $global-radius; -// $range-slider-round: $global-rounded; -// $range-slider-bar-bg-color: $ghost; -// $range-slider-active-segment-bg-color: scale-color($secondary-color, $lightness: -1%); - -// Vertical bar styles -// $range-slider-vertical-bar-width: rem-calc(16); -// $range-slider-vertical-bar-height: rem-calc(200); - -// These variabels define the slider handle styles -// $range-slider-handle-width: rem-calc(32); -// $range-slider-handle-height: rem-calc(22); -// $range-slider-handle-position-top: rem-calc(-5); -// $range-slider-handle-bg-color: $primary-color; -// $range-slider-handle-border-width: 1px; -// $range-slider-handle-border-style: solid; -// $range-slider-handle-border-color: none; -// $range-slider-handle-radius: $global-radius; -// $range-slider-handle-round: $global-rounded; -// $range-slider-handle-bg-hover-color: scale-color($primary-color, $lightness: -12%); -// $range-slider-handle-cursor: pointer; - -// $range-slider-disabled-opacity: .7; -// $range-slider-disabled-cursor: $cursor-disabled-value; - -// 25. Reveal -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-reveal-classes: $include-html-classes; - -// We use these to control the style of the reveal overlay. -// $reveal-overlay-bg: rgba($black, .45); -// $reveal-overlay-bg-old: $black; - -// We use these to control the style of the modal itself. -// $reveal-modal-bg: $white; -// $reveal-position-top: rem-calc(100); -// $reveal-default-width: 80%; -// $reveal-max-width: $row-width; -// $reveal-modal-padding: rem-calc(20); -// $reveal-box-shadow: 0 0 10px rgba($black,.4); - -// We use these to style the reveal close button -// $reveal-close-font-size: rem-calc(40); -// $reveal-close-top: rem-calc(10); -// $reveal-close-side: rem-calc(22); -// $reveal-close-color: $base; -// $reveal-close-weight: $font-weight-bold; - -// We use this to set the default radius used throughout the core. -// $reveal-radius: $global-radius; -// $reveal-round: $global-rounded; - -// We use these to control the modal border -// $reveal-border-style: solid; -// $reveal-border-width: 1px; -// $reveal-border-color: $steel; - -// $reveal-modal-class: "reveal-modal"; -// $close-reveal-modal-class: "close-reveal-modal"; - -// 26. Side Nav -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-nav-classes: $include-html-classes; - -// We use this to control padding. -// $side-nav-padding: rem-calc(14 0); - -// We use these to control list styles. -// $side-nav-list-type: none; -// $side-nav-list-position: outside; -// $side-nav-list-margin: rem-calc(0 0 7 0); - -// We use these to control link styles. -// $side-nav-link-color: $primary-color; -// $side-nav-link-color-active: scale-color($side-nav-link-color, $lightness: 30%); -// $side-nav-link-color-hover: scale-color($side-nav-link-color, $lightness: 30%); -// $side-nav-link-bg-hover: hsla(0, 0, 0, .025); -// $side-nav-link-margin: 0; -// $side-nav-link-padding: rem-calc(7 14); -// $side-nav-font-size: rem-calc(14); -// $side-nav-font-weight: $font-weight-normal; -// $side-nav-font-weight-active: $side-nav-font-weight; -// $side-nav-font-family: $body-font-family; -// $side-nav-font-family-active: $side-nav-font-family; - -// We use these to control heading styles. -// $side-nav-heading-color: $side-nav-link-color; -// $side-nav-heading-font-size: $side-nav-font-size; -// $side-nav-heading-font-weight: bold; -// $side-nav-heading-text-transform: uppercase; - -// We use these to control border styles -// $side-nav-divider-size: 1px; -// $side-nav-divider-style: solid; -// $side-nav-divider-color: scale-color($white, $lightness: 10%); - -// 27. Split Buttons -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-button-classes: $include-html-classes; - -// We use these to control different shared styles for Split Buttons -// $split-button-function-factor: 10%; -// $split-button-pip-color: $white; -// $split-button-span-border-color: rgba(255,255,255,0.5); -// $split-button-pip-color-alt: $oil; -// $split-button-active-bg-tint: rgba(0,0,0,0.1); - -// We use these to control tiny split buttons -// $split-button-padding-tny: $button-pip-tny * 10; -// $split-button-span-width-tny: $button-pip-tny * 6; -// $split-button-pip-size-tny: $button-pip-tny; -// $split-button-pip-top-tny: $button-pip-tny * 2; -// $split-button-pip-default-float-tny: rem-calc(-6); - -// We use these to control small split buttons -// $split-button-padding-sml: $button-pip-sml * 10; -// $split-button-span-width-sml: $button-pip-sml * 6; -// $split-button-pip-size-sml: $button-pip-sml; -// $split-button-pip-top-sml: $button-pip-sml * 1.5; -// $split-button-pip-default-float-sml: rem-calc(-6); - -// We use these to control medium split buttons -// $split-button-padding-med: $button-pip-med * 9; -// $split-button-span-width-med: $button-pip-med * 5.5; -// $split-button-pip-size-med: $button-pip-med - rem-calc(3); -// $split-button-pip-top-med: $button-pip-med * 1.5; -// $split-button-pip-default-float-med: rem-calc(-6); - -// We use these to control large split buttons -// $split-button-padding-lrg: $button-pip-lrg * 8; -// $split-button-span-width-lrg: $button-pip-lrg * 5; -// $split-button-pip-size-lrg: $button-pip-lrg - rem-calc(6); -// $split-button-pip-top-lrg: $button-pip-lrg + rem-calc(5); -// $split-button-pip-default-float-lrg: rem-calc(-6); - -// 28. Sub Nav -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-nav-classes: $include-html-classes; - -// We use these to control margin and padding -// $sub-nav-list-margin: rem-calc(-4 0 18); -// $sub-nav-list-padding-top: rem-calc(4); - -// We use this to control the definition -// $sub-nav-font-family: $body-font-family; -// $sub-nav-font-size: rem-calc(14); -// $sub-nav-font-color: $aluminum; -// $sub-nav-font-weight: $font-weight-normal; -// $sub-nav-text-decoration: none; -// $sub-nav-padding: rem-calc(3 16); -// $sub-nav-border-radius: 3px; -// $sub-nav-font-color-hover: scale-color($sub-nav-font-color, $lightness: -25%); - - -// We use these to control the active item styles - -// $sub-nav-active-font-weight: $font-weight-normal; -// $sub-nav-active-bg: $primary-color; -// $sub-nav-active-bg-hover: scale-color($sub-nav-active-bg, $lightness: -14%); -// $sub-nav-active-color: $white; -// $sub-nav-active-padding: $sub-nav-padding; -// $sub-nav-active-cursor: default; - -// $sub-nav-item-divider: ""; -// $sub-nav-item-divider-margin: rem-calc(12); - -// 29. Switch -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-form-classes: $include-html-classes; - -// Controlling background color for the switch container -// $switch-bg: $gainsboro; - -// We use these to control the switch heights for our default classes -// $switch-height-tny: 1.5rem; -// $switch-height-sml: 1.75rem; -// $switch-height-med: 2rem; -// $switch-height-lrg: 2.5rem; -// $switch-bottom-margin: 1.5rem; - -// We use these to style the switch-paddle -// $switch-paddle-bg: $white; -// $switch-paddle-transition-speed: .15s; -// $switch-paddle-transition-ease: ease-out; -// $switch-active-color: $primary-color; - -// 30. Tables -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-table-classes: $include-html-classes; - -// These control the background color for the table and even rows -// $table-bg: $white; -// $table-even-row-bg: $snow; - -// These control the table cell border style -// $table-border-style: solid; -// $table-border-size: 1px; -// $table-border-color: $gainsboro; - -// These control the table head styles -// $table-head-bg: $white-smoke; -// $table-head-font-size: rem-calc(14); -// $table-head-font-color: $jet; -// $table-head-font-weight: $font-weight-bold; -// $table-head-padding: rem-calc(8 10 10); - -// These control the table foot styles -// $table-foot-bg: $table-head-bg; -// $table-foot-font-size: $table-head-font-size; -// $table-foot-font-color: $table-head-font-color; -// $table-foot-font-weight: $table-head-font-weight; -// $table-foot-padding: $table-head-padding; - -// These control the caption -// table-caption-bg: transparent; -// $table-caption-font-color: $table-head-font-color; -// $table-caption-font-size: rem-calc(16); -// $table-caption-font-weight: bold; - -// These control the row padding and font styles -// $table-row-padding: rem-calc(9 10); -// $table-row-font-size: rem-calc(14); -// $table-row-font-color: $jet; -// $table-line-height: rem-calc(18); - -// These are for controlling the layout, display and margin of tables -// $table-layout: auto; -// $table-display: table-cell; -// $table-margin-bottom: rem-calc(20); - - -// 31. Tabs -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-tabs-classes: $include-html-classes; - -// $tabs-navigation-padding: rem-calc(16); -// $tabs-navigation-bg-color: $silver; -// $tabs-navigation-active-bg-color: $white; -// $tabs-navigation-hover-bg-color: scale-color($tabs-navigation-bg-color, $lightness: -6%); -// $tabs-navigation-font-color: $jet; -// $tabs-navigation-active-font-color: $tabs-navigation-font-color; -// $tabs-navigation-font-size: rem-calc(16); -// $tabs-navigation-font-family: $body-font-family; - -// $tabs-content-margin-bottom: rem-calc(24); -// $tabs-content-padding: ($column-gutter/2); - -// $tabs-vertical-navigation-margin-bottom: 1.25rem; - -// 32. Thumbnails -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-media-classes: $include-html-classes; - -// We use these to control border styles -// $thumb-border-style: solid; -// $thumb-border-width: 4px; -// $thumb-border-color: $white; -// $thumb-box-shadow: 0 0 0 1px rgba($black,.2); -// $thumb-box-shadow-hover: 0 0 6px 1px rgba($primary-color,0.5); - -// Radius and transition speed for thumbs -// $thumb-radius: $global-radius; -// $thumb-transition-speed: 200ms; - -// 33. Tooltips -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-tooltip-classes: $include-html-classes; - -// $has-tip-border-bottom: dotted 1px $iron; -// $has-tip-font-weight: $font-weight-bold; -// $has-tip-font-color: $oil; -// $has-tip-border-bottom-hover: dotted 1px scale-color($primary-color, $lightness: -55%); -// $has-tip-font-color-hover: $primary-color; -// $has-tip-cursor-type: help; - -// $tooltip-padding: rem-calc(12); -// $tooltip-bg: $oil; -// $tooltip-font-size: rem-calc(14); -// $tooltip-font-weight: $font-weight-normal; -// $tooltip-font-color: $white; -// $tooltip-line-height: 1.3; -// $tooltip-close-font-size: rem-calc(10); -// $tooltip-close-font-weight: $font-weight-normal; -// $tooltip-close-font-color: $monsoon; -// $tooltip-font-size-sml: rem-calc(14); -// $tooltip-radius: $global-radius; -// $tooltip-rounded: $global-rounded; -// $tooltip-pip-size: 5px; -// $tooltip-max-width: 300px; - -// 34. Top Bar -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-top-bar-classes: $include-html-classes; - -// Background color for the top bar - $topbar-bg-color: $secondary-color; - $topbar-bg: $topbar-bg-color; - -// Height and margin - $topbar-height: rem-calc(40); -// $topbar-margin-bottom: 0; - -// Controlling the styles for the title in the top bar -// $topbar-title-weight: $font-weight-normal; -// $topbar-title-font-size: rem-calc(17); - -// Set the link colors and styles for top-level nav -// $topbar-link-color: $white; -// $topbar-link-color-hover: $white; -// $topbar-link-color-active: $white; -// $topbar-link-color-active-hover: $white; - $topbar-link-weight: bold; - $topbar-link-font-size: rem-calc(12px); -// $topbar-link-hover-lightness: -10%; // Darken by 10% -// $topbar-link-bg: $topbar-bg; - $topbar-link-bg-hover: darken($topbar-bg, 5%); -// $topbar-link-bg-color-hover: $charcoal; -// $topbar-link-bg-active: $primary-color; -// $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%); -// $topbar-link-font-family: $body-font-family; -// $topbar-link-text-transform: none; -// $topbar-link-padding: ($topbar-height / 3); -// $topbar-back-link-size: rem-calc(18); -// $topbar-link-dropdown-padding: rem-calc(20); -// $topbar-button-font-size: .75rem; -// $topbar-button-top: 7px; - -// Style the top bar dropdown elements - $topbar-dropdown-bg: $primary-color; -// $topbar-dropdown-link-color: $white; -// $topbar-dropdown-link-color-hover: $topbar-link-color-hover; - $topbar-dropdown-link-bg: $topbar-dropdown-bg; - $topbar-dropdown-link-bg-hover: darken($topbar-dropdown-bg, 5%); - $topbar-dropdown-link-weight: bold; -// $topbar-dropdown-toggle-size: 5px; -// $topbar-dropdown-toggle-color: $white; -// $topbar-dropdown-toggle-alpha: .4; - -// $topbar-dropdown-label-color: $monsoon; -// $topbar-dropdown-label-text-transform: uppercase; -// $topbar-dropdown-label-font-weight: $font-weight-bold; -// $topbar-dropdown-label-font-size: rem-calc(10); -// $topbar-dropdown-label-bg: $oil; - -// Top menu icon styles -// $topbar-menu-link-transform: uppercase; -// $topbar-menu-link-font-size: rem-calc(13); -// $topbar-menu-link-weight: $font-weight-bold; -// $topbar-menu-link-color: $white; -// $topbar-menu-icon-color: $white; -// $topbar-menu-link-color-toggled: $jumbo; -// $topbar-menu-icon-color-toggled: $jumbo; -// $topbar-menu-icon-position: $opposite-direction; // Change to $default-float for a left menu icon - -// Transitions and breakpoint styles -// $topbar-transition-speed: 300ms; -// Using rem-calc for the below breakpoint causes issues with top bar -// $topbar-breakpoint: #{lower-bound($medium-range)}; // Change to 9999px for always mobile layout -// $topbar-media-query: "#{$screen} and (min-width:#{lower-bound($topbar-breakpoint)})"; - -// Top-bar input styles -// $topbar-input-height: rem-calc(28); - -// Divider Styles -// $topbar-divider-border-bottom: solid 1px scale-color($topbar-bg-color, $lightness: 13%); -// $topbar-divider-border-top: solid 1px scale-color($topbar-bg-color, $lightness: -50%); - -// Sticky Class -// $topbar-sticky-class: ".sticky"; - $topbar-arrows: false; //Set false to remove the triangle icon from the menu item -// $topbar-dropdown-arrows: true; //Set false to remove the \00bb >> text from dropdown subnavigation li// - -// 36. Visibility Classes -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// $include-html-visibility-classes: $include-html-classes; -// $include-accessibility-classes: true; -// $include-table-visibility-classes: true; -// $include-legacy-visibility-classes: true; diff --git a/static/styles/app.scss b/static/styles/app.scss index a05b4c9f3..cbd46a7af 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -1,432 +1 @@ -@import "settings"; -@import "normalize"; -@import "foundation"; - -@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,700,400italic,700italic); - -$top-bar-dropdown-radius: $global-radius; - -// Foundation Restyling -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// Moving the mobile menu icon to the right -.title-area.left { - .toggle-topbar { - right: initial; - } - // Making sure dropdowns on mobile are not rendered on top of the top bar. - @media #{$small-only} { - ~ .top-bar-section { - .has-dropdown.moved > .dropdown, - .dropdown { - top: $topbar-height; - } - } - } -} - -// Restyles to foundation top bar menu, in order to behave aesthetically different -/* -XXX -Is there a better way to implement these styles using best practices without the -need to override this much of foundation? Or at least avoid too much nesting and -specificity (better use of BEM and ITCSS)? -*/ - -.nav { - @media #{$topbar-media-query} { - .has-dropdown { - // Default values for dropdowns, while also being hidden. - .dropdown { - // Border-radius for the first and last dropdown items. We don't style the parent dropdown, as the items overflows it. - @include radius(rem-calc($top-bar-dropdown-radius)); - // Second child here actually targets the first item, since Foundation JS injects a hidden li before it for a mobile back button. - > li:nth-child(2), > li:nth-child(2) > a { - @include side-radius(top, rem-calc($top-bar-dropdown-radius)); - } - > li:last-child, li:last-child > a { - @include side-radius(bottom, rem-calc($top-bar-dropdown-radius)); - } - box-shadow: 0 10px 18px rgba(0, 0, 0, 0.19), - 0 2px 6px rgba(0, 0, 0, 0.23); - // For the transition effect. - opacity: 0; - // Show the dropdown accurately while it animates. - width: auto; - // This will allow the triangle pip to be visible above the dropdown. - overflow: visible; - // This ensures we won't accidentally trigger the dropdown if we hover on it, while the animation to default values is run. - pointer-events: none; - transform: translateY(rem-calc(25px)); - // This transition is actually for when we hover-out of the dropdown. - transition: transform 0.1s linear, - opacity 0.1s linear, - clip 0s 0.3s; - // The triangle pip - &::before { - @include css-triangle(rem-calc(6px), $topbar-dropdown-bg, bottom); - position: absolute; - top: rem-calc(-12px); - left: rem-calc(15px); - } - // This bridges the gap between the top bar and a dropdown. - &::after { - content: ""; - position: absolute; - z-index: -1; - left: 0; - top: rem-calc(-25px); - height: rem-calc(25px); - width: 100%; - // This transition is for hover-on. - transition: all 0.3s cubic-bezier(0.55,0,0.1,1); - } - } - // When hovering - &.hover, &.not-click:hover { - > .dropdown { - opacity: 1; - // Here we override the default clip value ("auto") for an arbitrary large size that fits any dropdown, - // as this now makes it possible to apply a transition effect for it. - clip: rect(-100px, 2000px, 2000px, -100px); - transform: translateY(rem-calc(10px)); - // Reverting back our pointer-events. - pointer-events: auto; - // Animating with a beautiful cubic-bezier curve, or Google's "Swift out" easing :) - transition: transform 0.3s cubic-bezier(0.55,0,0.1,1), - opacity 0.3s cubic-bezier(0.55,0,0.1,1), - // Here we make sure the clipping is set before any other transition. - clip 0s 0s; - // Don't forget to properly animate our bridge, so it keeps only between our gap. - &::after { - top: rem-calc(-10px); - } - } - } - } - } -} - - - -// Our app -// - - - - - - - - - - - - - - - - - - - - - - - - - - -@-webkit-keyframes fadeIn { - 0% {opacity: 0;} - 100% {opacity: 1;} -} -@keyframes fadeIn { - 0% {opacity: 0;} - 100% {opacity: 1;} -} - -html, body { - margin: 0; - padding: 0; - height: 100%; -} - -h1, h2, h3, h4, h5, h6, form, dl, dt, dd, p, div, img, a { - margin: 0; - padding: 0; -} - -img { - border: none; -} - -a { - background-color: transparent; - color: $primary-color; - text-decoration: none; - transition: 0.2s; -} - -h1 { - color: $primary-color; - font-size: 120%; -} - -h2 { - color: $primary-color; - font-size: 110%; -} - -h1 a, h2 a, h3 a, h1 a:hover, h2 a:hover, h3 a:hover { - color: $primary-color; -} - -.fadein { - -webkit-animation: fadeIn 0.25s ease-in-out; - -moz-animation: fadeIn 0.25s ease-in-out; - -o-animation: fadeIn 0.25s ease-in-out; -} - -.container { - position: relative; - margin: 0 auto; - padding: 20px; - max-width: 960px; -} - -.page { - position: relative; - display: table; - width: 100%; - height: 100%; - background-color: #fafafa; - color: #444444; -} - -.page__row { - display: table-row; - box-sizing: content-box; -} - -/* XXX find a better way to fix main layout box-sizing */ -.page__row > .container > *{ - box-sizing: border-box; -} - -.navigation { - box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 1px 4px rgba(0, 0, 0, 0.23); -} - -.navigation > .container { - padding: 0px; - max-width: 960px; -} - -.icon-bar { - vertical-align: top; -} - -.masthead .container { - padding: 10px 0; - background-color: #e3e3e3; -} - -.masthead > .container { - padding: 0px; - max-width: none; - border-bottom: 1px solid $primary-color; -} - -.masthead__logo { - display: inline-block; - vertical-align: middle; -} - -.masthead__logo a { - display: block; -} - -.masthead__logo img { - width: auto; - height: 85px; -} - -.masthead__heading { - display: inline-block; - margin-left: 10px; - margin-top:10px; - vertical-align: top; -} - -.masthead__heading h1 { - color: #333333; - text-shadow: 1px 1px 3px #dadada; - font-size: 130%; -} - -.masthead__heading h2 { - padding-left: 2px; - color: #444444; - text-shadow: 1px 1px 3px #dadada; - font-weight: normal; - font-size: 90%; -} - - -.masthead .sub-nav { - display: block; - overflow: visible; - padding-top: 0.25rem; - width: auto; - position: absolute; - bottom: -1px; - margin: 0; - right: 0.5em; - - - dd { - margin: 0; - border: 1px solid transparent; - border-bottom: 1px solid $primary-color; - border-top: 2px solid transparent; - border-radius: 5px 5px 0px 0px; - transition: all 0.5s cubic-bezier(0.55,0,0.1,1); - - ul { - margin-right: -3px; - &::after, &::before { - border: 0px; - } - li { - margin: 0; - display: block; - padding: 0.3rem; - color: #555555; - width: 100%; - a { - display: block; - } - - &:hover, &.active { - background: #eee; - - } - } - } - - a { - color: #18577A; - background-color: transparent; - display: inline-block; - padding: 2px 6px 0; - position: relative; - font-size: 90%; - &:hover { - color: #444; - background-color: transparent; - } - } - - &:hover, &.active { - background: #fff; - border: 1px solid $primary-color; - border-bottom: 1px solid #fff; - border-top: 2px solid $primary-color; - transition: all 0.5s cubic-bezier(0.55,0,0.1,1); - - } - } -} - -.content { - position: relative; - display: table-cell; - overflow: hidden; - height: 100%; - text-align: left; - font-size: 100%; -} - -.content > .container { - height: 100%; - background-color: #ffffff; -} -/* Layout */ - -.footer { - width: 100%; - background-color: $secondary-color; - color: #ffffff; - text-align: center; -} - -.footer__block { - position: relative; - display: inline-block; - margin: 5px 0; - padding: 0 20px; - vertical-align: middle; - font-size: 70%; -} - -.footer__block a { - color: rgb(255, 255, 255); - font-weight: 600; -} - -.footer__block a:hover { - text-decoration: underline; -} - -.footer__block small { - font-size: 100%; -} - -.footer__logo { - display: block; - font-size: 0; - margin-bottom: 10px; -} - -.footer__logo > img { - height: 32px; -} - -.footer__block--about { - padding-left: 0; - max-width: 195px; -} - -.footer__block--license { - max-width: 285px; -} - -.footer__block--parliament-info { - border: 0; - padding-right: 0; - max-width: 385px; -} - -.footer__block--parliament-info > abbr { - border: 0; - font-size: inherit; - cursor: inherit; - color: inherit; -} - -.footer__block--separator::after { - content: ''; - position: absolute; - top: 0; - bottom: 0; - right: 0; - margin: auto; - height: 50px; - width: 1px; - background-color: white; -} - -@media (max-width: 480px) { - - .masthead { - text-align: center - } - - .masthead__logo { - display: block; - margin: 10px; - } - - .masthead__heading { - margin-left: 0; - } - - .masthead__logo > img{ - height: 80px; - } - - .masthead__heading h1 { - font-size: 90%; - } - - .masthead__heading h2 { - font-size: 70%; - } - -} +@import "bootstrap"; From b7be43d82ecdea2800a0aa118aa783fe55721ee0 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Mon, 18 Jan 2016 11:24:02 -0200 Subject: [PATCH 02/31] Convert header navbar to Bootstrap --- static/styles/_header.scss | 10 ++++ static/styles/app.scss | 2 + templates/base.html | 101 ++++++++++++++++++------------------- 3 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 static/styles/_header.scss diff --git a/static/styles/_header.scss b/static/styles/_header.scss new file mode 100644 index 000000000..e5fa310a3 --- /dev/null +++ b/static/styles/_header.scss @@ -0,0 +1,10 @@ + +$logo-height: 0.8 * $navbar-height; +$logo-margin: ($navbar-height - $logo-height) / 2; + +.logo img { + width: $logo-height; + height: $logo-height; + margin: $logo-margin $navbar-padding-horizontal; +} + diff --git a/static/styles/app.scss b/static/styles/app.scss index cbd46a7af..a36f11de7 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -1 +1,3 @@ @import "bootstrap"; +@import "header"; + diff --git a/templates/base.html b/templates/base.html index 9c84d5c98..e43dd814a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,17 +15,11 @@ {# Styles #} - - {# Scripts #} {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} - - - - {% endblock %} @@ -34,49 +28,53 @@
- {# Navigation #} {% block navigation %} -
+ {% endblock navigation %} {# Header #} @@ -215,19 +218,15 @@ {% block foot_js %} - - - - + + + + + - - - {% block extra_js %} - {% endblock %} + {% block extra_js %}{% endblock %} {% endblock foot_js %} From 4380c4bb34a7a30c7361b1b8fcf498b7e28d9f0c Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 19 Jan 2016 12:27:55 -0200 Subject: [PATCH 03/31] Convert base header and use drunken parrot theme --- sapl/settings.py | 1 + static/styles/app.scss | 34 ++++++++++- templates/base.html | 55 +++++++----------- templates/sessao/sessaoplenaria_detail.html | 63 ++++++++++++++------- 4 files changed, 94 insertions(+), 59 deletions(-) diff --git a/sapl/settings.py b/sapl/settings.py index 44d0bbd1e..92a03d278 100644 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -171,6 +171,7 @@ BOWER_INSTALLED_APPS = ( 'jquery-runner', 'jQuery-Mask-Plugin', 'jsdiff', + 'https://github.com/hoarrd/drunken-parrot-flat-ui.git', ) # Additional search paths for SASS files when using the @import statement diff --git a/static/styles/app.scss b/static/styles/app.scss index a36f11de7..af748caa8 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -1,3 +1,35 @@ -@import "bootstrap"; + +//@import "bootstrap"; +@import "bootstrap/variables.scss"; @import "header"; +.vcenter { + display: inline-block; + vertical-align: middle; + float: none; +} + +.masthead { +// border-bottom: 1px solid #D6E1E5; + padding: 10px; + h1 { + font-size: 22px; + margin: 10px; + } + img { + margin-right: $navbar-padding-horizontal; + } +} + +.navbar { + margin-bottom: 0; +} + +// TODO: ajust all the hx sizes from drunken parrot +h1, +.h1 { + font-size: 30px; +} +.page-header { + margin: 20px 0px 10px; +} diff --git a/templates/base.html b/templates/base.html index e43dd814a..428f91320 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,8 +16,11 @@ {# Styles #} + + + {# Scripts #} {# modernizr must be in head (see http://modernizr.com/docs/#installing) #} @@ -39,15 +42,6 @@ - - {{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }} - diff --git a/templates/sessao/sessaoplenaria_detail.html b/templates/sessao/sessaoplenaria_detail.html index 2bf47cbe3..40af99618 100644 --- a/templates/sessao/sessaoplenaria_detail.html +++ b/templates/sessao/sessaoplenaria_detail.html @@ -2,28 +2,47 @@ {% load i18n %} {% block actions %} {% endblock %} {% block sections_nav %} -
-
-
-
{% trans 'Expedientes' %} -
-
{% trans 'Ordem do Dia' %} -
+
+
  • + + {% trans 'Abertura' %} + + + +
    • + +
  • + + {% trans 'Expedientes' %} + + + +
    • + +
  • + + {% trans 'Ordem do Dia' %} + + + +
    • + +
  • {% trans 'Painel Eletrônico' %}
    • +
  • {% trans 'Resumo' %}
    • + + {% endblock sections_nav %} From 49c844cf42528de21dab9a71d2a8a099efccdbba Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 19 Jan 2016 13:37:56 -0200 Subject: [PATCH 04/31] Move subnav to base header --- static/styles/app.scss | 21 ++++++++++++++++----- templates/base.html | 21 ++++++++++++--------- templates/sessao/sessaoplenaria_detail.html | 2 +- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/static/styles/app.scss b/static/styles/app.scss index af748caa8..da3f17e2b 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -10,21 +10,32 @@ } .masthead { -// border-bottom: 1px solid #D6E1E5; padding: 10px; - h1 { - font-size: 22px; - margin: 10px; - } + .nav { + margin-top: 65px; + } + .navbar-brand { + color: $headings-color; + font-size: 24px; img { margin-right: $navbar-padding-horizontal; } + small { + color: #93A4AA; + font-size: 75%; + line-height: 25px; + } + } } .navbar { margin-bottom: 0; } +.navbar-brand { + padding: 0px; +} + // TODO: ajust all the hx sizes from drunken parrot h1, .h1 { diff --git a/templates/base.html b/templates/base.html index 428f91320..2a2920a7b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -114,13 +114,18 @@ {% block main_header %}
    - Logo -

    - {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} - {{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }} -
    {% trans 'Sistema de Apoio ao Processo Legislativo' %} -

    +
    + + Logo + + {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #} + {{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }} +
    {% trans 'Sistema de Apoio ao Processo Legislativo' %} +     +     +
    + {% block sections_nav %}{% endblock %}
    {% endblock main_header %} @@ -158,8 +163,6 @@ {% endblock base_header %} - {% block sections_nav %}{% endblock %} - {# Content per se #} {% block base_content %}{% endblock %} diff --git a/templates/sessao/sessaoplenaria_detail.html b/templates/sessao/sessaoplenaria_detail.html index 40af99618..0932ca317 100644 --- a/templates/sessao/sessaoplenaria_detail.html +++ b/templates/sessao/sessaoplenaria_detail.html @@ -3,7 +3,7 @@ {% block actions %} {% endblock %} {% block sections_nav %} -
      +
      • From 5e36876f5b99b920c9acb93c979e0f865c885db0 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 19 Jan 2016 15:44:23 -0200 Subject: [PATCH 05/31] Use bootstrap for grid layout --- sapl/layout.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sapl/layout.py b/sapl/layout.py index cb08db49b..58c15e902 100644 --- a/sapl/layout.py +++ b/sapl/layout.py @@ -1,15 +1,15 @@ -from crispy_forms_foundation.layout import (HTML, Column, Div, Fieldset, - Layout, Row, Submit) +from crispy_forms.bootstrap import FormActions +from crispy_forms.layout import Submit, Layout, Div, Fieldset, HTML from django.utils.translation import ugettext as _ def to_column(name_span): fieldname, span = name_span - return Column(fieldname, css_class='large-%d' % span) + return Div(fieldname, css_class='col-sm-%d' % span) def to_row(names_spans): - return Row(*list(map(to_column, names_spans))) + return Div(*map(to_column, names_spans), css_class='row-fluid') def to_fieldsets(fields): @@ -25,13 +25,9 @@ def to_fieldsets(fields): class SaplFormLayout(Layout): def __init__(self, *fields): - buttons = Div( + buttons = FormActions( + Submit('save', _('Enviar'), css_class='btn btn-primary '), HTML('%s' % _('Cancelar')), - Submit('submit', _('Enviar'), - css_class='button radius success right'), - css_class='radius clearfix' - ) - _fields = list(to_fieldsets(fields)) + \ - [Row(Column(buttons, css_class='clearfix'))] + ' class="btn btn-inverse">%s' % _('Cancelar'))) + _fields = list(to_fieldsets(fields)) + [to_row([(buttons, 12)])] super(SaplFormLayout, self).__init__(*_fields) From 3925e610505225d5d09261a466eadd84290d2177 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Tue, 19 Jan 2016 16:52:54 -0200 Subject: [PATCH 06/31] Convert crud detail to bootstrap --- static/styles/app.scss | 46 ++++++++++++++++++++++++++++++++++---- templates/crud/detail.html | 25 ++++++++++----------- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/static/styles/app.scss b/static/styles/app.scss index da3f17e2b..18140604b 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -1,5 +1,4 @@ -//@import "bootstrap"; @import "bootstrap/variables.scss"; @import "header"; @@ -36,11 +35,50 @@ padding: 0px; } -// TODO: ajust all the hx sizes from drunken parrot -h1, -.h1 { +// ADJUST DRUNKEN PARROT STYLES ######################################## +h1, .h1 { font-size: 30px; } +h2, .h2 { + font-size: 24px; +} +h3, .h3 { + font-size: 20px; +} +h4, .h4 { + font-size: 16px; +} +h5, .h5 { + font-size: 14px; +} +h6, .h6 { + font-size: 12px; +} + .page-header { margin: 20px 0px 10px; } + +// #### CRUD DETAIL ######################################## +p.control-label { + font-weight: bold; +} + +// copied from bootstrap _forms.scss legend +// using @extend would require importing parts of bootstrap again and overriding drunken parrot css +// @import "bootstrap/mixins.scss"; +// @import "bootstrap/forms.scss"; + +.legend { + display: block; + width: 100%; + padding: 0; + margin-bottom: $line-height-computed; + font-size: ($font-size-base * 1.5); + line-height: inherit; + color: $legend-color; + border: 0; + border-bottom: 1px solid $legend-border-color; +} + + diff --git a/templates/crud/detail.html b/templates/crud/detail.html index b0fc0c6ce..87385349b 100644 --- a/templates/crud/detail.html +++ b/templates/crud/detail.html @@ -11,27 +11,26 @@
        {% trans 'Excluir' %}
        {% endblock actions %} - {% block detail_content %} {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #} {% for fieldset in view.fieldsets %} -
        - {{ fieldset.legend }} - {% for row in fieldset.rows %} -
        - {% for column in row %} -
        -
        - {# TODO replace labels, probably (are they correct here?) #} -

        {{ column.text }}

        -
        +

        {{ fieldset.legend }}

        + {% for row in fieldset.rows %} +
        + {% for column in row %} +
        +
        +

        {{ column.verbose_name }}

        +
        +

        {{ column.text }}

        - {% endfor %} +
        {% endfor %} -
        + + {% endfor %} {% endfor %} {% endblock detail_content %} From 0fa33076731ede649abc34d98371fc7532bbbdc3 Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 28 Jan 2016 13:35:40 -0200 Subject: [PATCH 07/31] Convert footer to bootstrap --- static/styles/app.scss | 27 +++++++++++++++++++ templates/base.html | 60 +++++++++++++++++++++++++----------------- 2 files changed, 63 insertions(+), 24 deletions(-) diff --git a/static/styles/app.scss b/static/styles/app.scss index 18140604b..0ebef1a65 100644 --- a/static/styles/app.scss +++ b/static/styles/app.scss @@ -81,4 +81,31 @@ p.control-label { border-bottom: 1px solid $legend-border-color; } +// #### footer ########################################### +// based on http://getbootstrap.com/examples/sticky-footer +$footer-height : 140px; +html { + position: relative; + min-height: 100%; +} +body { + margin-bottom: $footer-height + 20px; +} +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: $footer-height; + background: #364347 none repeat scroll 0% 0%; + color: white; + text-align: center; + p { + color: white; + margin-top: 10px; + } + .container { + padding-top: 25px; + } +} diff --git a/templates/base.html b/templates/base.html index 2a2920a7b..70dfc9996 100644 --- a/templates/base.html +++ b/templates/base.html @@ -173,31 +173,43 @@ From fee403c12b1b199859d1edc3b62b978990c5980b Mon Sep 17 00:00:00 2001 From: Marcio Mazza Date: Thu, 28 Jan 2016 13:36:12 -0200 Subject: [PATCH 08/31] Use dark navbar --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 70dfc9996..3fd9b8a50 100644 --- a/templates/base.html +++ b/templates/base.html @@ -33,7 +33,7 @@ {% block navigation %} -