diff --git a/app/assets/cookielaw/css/cookielaw.css b/app/assets/cookielaw/css/cookielaw.css index c6725b435be..65e8d963539 100644 --- a/app/assets/cookielaw/css/cookielaw.css +++ b/app/assets/cookielaw/css/cookielaw.css @@ -5,7 +5,6 @@ background-color: #F2F6F9; width: 100%; z-index: 999999999; - font-family: 'Muli', sans-serif; } #CookielawBanner .container { diff --git a/app/assets/onepager/css/main.css b/app/assets/onepager/css/main.css index 7bfb4230f53..d66e79fd850 100644 --- a/app/assets/onepager/css/main.css +++ b/app/assets/onepager/css/main.css @@ -1,26 +1,10 @@ +/* One-Pager CSS */ @charset "UTF-8"; /* stylelint-disable no-descending-specificity */ -/* ...because sometimes descending-specificity is a PIA to clean up */ - -/* Futura */ - -@font-face { - font-family: 'futura-pt'; - src: url('/static/v2/fonts/futura/font4.ttf')/* TTF file for CSS3 browsers */ -} - -/* Muli Regular */ - -@font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/Regular.ttf'); - font-weight: 400; -} - body { line-height: 1; - font-family: 'Muli', sans-serif !important; + font-family: 'Muli', sans-serif; -webkit-text-size-adjust: none; overflow: hidden; width: 100%; @@ -72,7 +56,6 @@ body.is-loading:after { text-transform: uppercase; font-size: 14px; padding: 4px 7px; - font-family: 'Muli', sans-serif; font-weight: 100; letter-spacing: 0.15em; margin: 5px; @@ -716,8 +699,6 @@ dl dd { position: absolute; } -/* Footer */ - #footer { -moz-align-self: -moz-flex-end; -webkit-align-self: -webkit-flex-end; diff --git a/app/assets/v2/_variables.scss b/app/assets/v2/_variables.scss deleted file mode 100644 index ed690ebc90b..00000000000 --- a/app/assets/v2/_variables.scss +++ /dev/null @@ -1,849 +0,0 @@ -// Variables -// -// Variables should follow the `$component-state-property-size` formula for -// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs. - -// -// Color system -// - -$white: #eff4ee !default; -$gray-100: #f9f9f9 !default; -$gray-200: #e9ecef !default; -$gray-300: #f8f9fa !default; -$gray-400: #ced4da !default; -$gray-500: #adb5bd !default; -$gray-600: #868e96 !default; -$gray-700: #495057 !default; -$gray-800: #343a40 !default; -$gray-900: #212529 !default; -$black: #000 !default; - -$grays: () !default; -$grays: map-merge( - - ( - 100: $gray-100, - 200: $gray-200, - 300: $gray-300, - 400: $gray-400, - 500: $gray-500, - 600: $gray-600, - 700: $gray-700, - 800: $gray-800, - 900: $gray-900 - ), - $grays -); - -$blue: #3e24fb !default; -$darkBlue: #0d023b !default; -$indigo: #6610f2 !default; -$purple: #6f42c1 !default; -$pink: #f9006c !default; -$red: #dc3545 !default; -$orange: #fd7e14 !default; -$yellow: #ffce08 !default; -$green: #37ea9c !default; -$teal: #20c997 !default; -$cyan: #17a2b8 !default; - -$colors: () !default; -$colors: map-merge( - - ( - blue: $blue, - indigo: $indigo, - purple: $purple, - pink: $pink, - red: $red, - orange: $orange, - yellow: $yellow, - green: $green, - teal: $teal, - cyan: $cyan, - white: $white, - darkBlue: $darkBlue, - gray: $gray-600, - gray-dark: $gray-800 - ), - $colors -); - -$theme-colors: () !default; -$theme-colors: map-merge( - - ( - primary: $blue, - secondary: $gray-300, - success: $green, - info: $pink, - warning: $yellow, - danger: $red, - light: $gray-100, - darkBlue: $darkBlue, - dark: #000000 - ), - $theme-colors -); - -// Set a specific jump point for requesting color jumps -$theme-color-interval: 8% !default; - -// Options -// -// Quickly modify global styling by enabling or disabling optional features. - -$enable-rounded: true !default; -$enable-shadows: false !default; -$enable-gradients: false !default; -$enable-transitions: true !default; -$enable-hover-media-query: false !default; -$enable-grid-classes: true !default; -$enable-print-styles: true !default; - -// Spacing -// -// Control the default styling of most Bootstrap elements by modifying these -// variables. Mostly focused on spacing. -// You can add more entries to the $spacers map, should you need more variation. - -$spacer: 1rem !default; -$spacers: ( - 0: 0, - 1: ($spacer * 0.25), - 2: ($spacer * 0.5), - 3: $spacer, - 4: ($spacer * 1.5), - 5: ($spacer * 3) - ) - !default; - -// This variable affects the `.h-*` and `.w-*` classes. -$sizes: (25: 25%, 50: 50%, 75: 75%, 100: 100%) !default; - -// Body -// -// Settings for the `` element. - -$body-bg: $white !default; -$body-color: $gray-900 !default; - -// Links -// -// Style anchor elements. - -$link-color: theme-color("primary") !default; -$link-decoration: none !default; -$link-hover-color: darken($link-color, 15%) !default; -$link-hover-decoration: underline !default; - -// Paragraphs -// -// Style p element. - -$paragraph-margin-bottom: 1rem !default; - -// Grid breakpoints -// -// Define the minimum dimensions at which your layout will change, -// adapting to different screen sizes, for use in media queries. - -$grid-breakpoints: (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px) !default; -@include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); -@include _assert-starts-at-zero($grid-breakpoints); - -// Grid containers -// -// Define the maximum width of `.container` for different screen sizes. - -$container-max-widths: (sm: 540px, md: 720px, lg: 960px, xl: 1140px) !default; -@include _assert-ascending($container-max-widths, "$container-max-widths"); - -// Grid columns -// -// Set the number of columns and specify the width of the gutters. - -$grid-columns: 12 !default; -$grid-gutter-width: 30px !default; - -// Components -// -// Define common padding and border radius sizes and more. - -$line-height-lg: 1.5 !default; -$line-height-sm: 1.5 !default; - -$border-width: 1px !default; -$border-color: $gray-200 !default; - -$border-radius: 0.25rem !default; -$border-radius-lg: 0.3rem !default; -$border-radius-sm: 0.2rem !default; - -$component-active-color: $white !default; -$component-active-bg: theme-color("primary") !default; - -$caret-width: 0.3em !default; - -$transition-base: all 0.2s ease-in-out !default; -$transition-fade: opacity 0.15s linear !default; -$transition-collapse: height 0.35s ease !default; - -// Fonts -// -// Font, line-height, and color for body text, headings, and more. - -$font-family-sans-serif: futura-pt, -apple-system, BlinkMacSystemFont, - "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", - "Segoe UI Emoji", "Segoe UI Symbol" !default; -$font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, - "Liberation Mono", "Courier New", monospace !default; -$font-family-base: $font-family-sans-serif !default; - -$font-size-base: 1rem !default; // Assumes the browser default, typically `16px` -$font-size-lg: 1.25rem !default; -$font-size-sm: 0.875rem !default; - -$font-weight-light: 300 !default; -$font-weight-normal: normal !default; -$font-weight-bold: bold !default; - -$font-weight-base: $font-weight-normal !default; -$line-height-base: 1.5 !default; - -$h1-font-size: 2.5rem !default; -$h2-font-size: 2rem !default; -$h3-font-size: 1.75rem !default; -$h4-font-size: 1.5rem !default; -$h5-font-size: 1.25rem !default; -$h6-font-size: 1rem !default; - -$headings-margin-bottom: ($spacer / 2) !default; -$headings-font-family: inherit !default; -$headings-font-weight: 500 !default; -$headings-line-height: 1.1 !default; -$headings-color: inherit !default; - -$display1-size: 6rem !default; -$display2-size: 5.5rem !default; -$display3-size: 4.5rem !default; -$display4-size: 3.5rem !default; - -$display1-weight: 300 !default; -$display2-weight: 300 !default; -$display3-weight: 300 !default; -$display4-weight: 300 !default; -$display-line-height: $headings-line-height !default; - -$lead-font-size: 1.25rem !default; -$lead-font-weight: 300 !default; - -$small-font-size: 80% !default; - -$text-muted: $gray-600 !default; - -$blockquote-small-color: $gray-600 !default; -$blockquote-font-size: ($font-size-base * 1.25) !default; - -$hr-border-color: rgba($black, 0.1) !default; -$hr-border-width: $border-width !default; - -$mark-padding: 0.2em !default; - -$dt-font-weight: $font-weight-bold !default; - -$kbd-box-shadow: inset 0 -0.1rem 0 rgba($black, 0.25) !default; -$nested-kbd-font-weight: $font-weight-bold !default; - -$list-inline-padding: 5px !default; - -$mark-bg: #fcf8e3 !default; - -// Tables -// -// Customizes the `.table` component with basic values, each used across all table variations. - -$table-cell-padding: 0.75rem !default; -$table-cell-padding-sm: 0.3rem !default; - -$table-bg: transparent !default; -$table-accent-bg: rgba($black, 0.05) !default; -$table-hover-bg: rgba($black, 0.075) !default; -$table-active-bg: $table-hover-bg !default; - -$table-border-width: $border-width !default; -$table-border-color: $gray-200 !default; - -$table-head-bg: $gray-200 !default; -$table-head-color: $gray-700 !default; - -$table-dark-bg: $gray-900 !default; -$table-dark-accent-bg: rgba($white, 0.05) !default; -$table-dark-hover-bg: rgba($white, 0.075) !default; -$table-dark-border-color: lighten($gray-900, 7.5%) !default; -$table-dark-color: $body-bg !default; - -// Buttons -// -// For each of Bootstrap's buttons, define text, background and border color. - -$input-btn-padding-y: 0.5rem !default; -$input-btn-padding-x: 0.75rem !default; -$input-btn-line-height: 1.25 !default; - -$input-btn-padding-y-sm: 0.25rem !default; -$input-btn-padding-x-sm: 0.5rem !default; -$input-btn-line-height-sm: 1.5 !default; - -$input-btn-padding-y-lg: 0.5rem !default; -$input-btn-padding-x-lg: 1rem !default; -$input-btn-line-height-lg: 1.5 !default; - -$btn-font-weight: $font-weight-normal !default; -$btn-box-shadow: inset 0 1px 0 rgba($white, 0.15), - 0 1px 1px rgba($black, 0.075) !default; -$btn-focus-box-shadow: 0 0 0 3px rgba(theme-color("primary"), 0.25) !default; -$btn-active-box-shadow: inset 0 3px 5px rgba($black, 0.125) !default; - -$btn-link-disabled-color: $gray-600 !default; - -$btn-block-spacing-y: 0.5rem !default; - -// Allows for customizing button radius independently from global border radius -$btn-border-radius: 1.5rem !default; -$btn-border-radius-lg: 1.5rem !default; -$btn-border-radius-sm: 1.5rem !default; - -$btn-transition: background-color 0.15s ease-in-out, - border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out !default; - -// Forms - -$input-bg: $white !default; -$input-disabled-bg: $gray-200 !default; - -$input-color: $gray-700 !default; -$input-border-color: rgba($black, 0.15) !default; -$input-btn-border-width: $border-width !default; // For form controls and buttons -$input-box-shadow: inset 0 1px 1px rgba($black, 0.075) !default; - -$input-border-radius: 1.5rem !default; -$input-border-radius-lg: 1.5rem !default; -$input-border-radius-sm: 1.5rem !default; - -$input-focus-bg: $input-bg !default; -$input-focus-border-color: lighten(theme-color("primary"), 25%) !default; -$input-focus-box-shadow: $input-box-shadow, $btn-focus-box-shadow !default; -$input-focus-color: $input-color !default; - -$input-placeholder-color: $gray-600 !default; - -$input-height-border: $input-btn-border-width * 2 !default; - -$input-height-inner: ($font-size-base * $input-btn-line-height) + - ( - $input-btn-padding-y * 2 - ) !default; -$input-height: calc(#{$input-height-inner} + #{$input-height-border}) !default; - -$input-height-inner-sm: ($font-size-sm * $input-btn-line-height-sm) + - ( - $input-btn-padding-y-sm * 2 - ) !default; -$input-height-sm: calc(#{$input-height-inner-sm} + #{$input-height-border}) - !default; - -$input-height-inner-lg: ($font-size-lg * $input-btn-line-height-lg) + - ( - $input-btn-padding-y-lg * 2 - ) !default; -$input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) - !default; - -$input-transition: border-color ease-in-out 0.15s, - box-shadow ease-in-out 0.15s !default; - -$form-text-margin-top: 0.25rem !default; - -$form-check-margin-bottom: 0.5rem !default; -$form-check-input-gutter: 1.25rem !default; -$form-check-input-margin-y: 0.25rem !default; -$form-check-input-margin-x: 0.25rem !default; - -$form-check-inline-margin-x: 0.75rem !default; - -$form-group-margin-bottom: 1rem !default; - -$input-group-addon-color: $input-color !default; -$input-group-addon-bg: $gray-200 !default; -$input-group-addon-border-color: $input-border-color !default; -$input-group-btn-border-color: $input-border-color !default; - -$custom-control-gutter: 1.5rem !default; -$custom-control-spacer-y: 0.25rem !default; -$custom-control-spacer-x: 1rem !default; - -$custom-control-indicator-size: 1rem !default; -$custom-control-indicator-bg: #ddd !default; -$custom-control-indicator-bg-size: 50% 50% !default; -$custom-control-indicator-box-shadow: inset 0 0.25rem 0.25rem rgba($black, 0.1) - !default; - -$custom-control-indicator-disabled-bg: $gray-200 !default; -$custom-control-description-disabled-color: $gray-600 !default; - -$custom-control-indicator-checked-color: $white !default; -$custom-control-indicator-checked-bg: theme-color("primary") !default; -$custom-control-indicator-checked-box-shadow: none !default; - -$custom-control-indicator-focus-box-shadow: 0 0 0 1px $body-bg, - 0 0 0 3px theme-color("primary") !default; - -$custom-control-indicator-active-color: $white !default; -$custom-control-indicator-active-bg: lighten(theme-color("primary"), 35%) - !default; -$custom-control-indicator-active-box-shadow: none !default; - -$custom-checkbox-indicator-border-radius: $border-radius !default; -$custom-checkbox-indicator-icon-checked: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; - -$custom-checkbox-indicator-indeterminate-bg: theme-color("primary") !default; -$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color - !default; -$custom-checkbox-indicator-icon-indeterminate: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; -$custom-checkbox-indicator-indeterminate-box-shadow: none !default; - -$custom-radio-indicator-border-radius: 50% !default; -$custom-radio-indicator-icon-checked: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; - -$custom-select-padding-y: 0.375rem !default; -$custom-select-padding-x: 0.75rem !default; -$custom-select-height: $input-height !default; -$custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator -$custom-select-line-height: $input-btn-line-height !default; -$custom-select-color: $input-color !default; -$custom-select-disabled-color: $gray-600 !default; -$custom-select-bg: $white !default; -$custom-select-disabled-bg: $gray-200 !default; -$custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions -$custom-select-indicator-color: #333 !default; -$custom-select-indicator: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; -$custom-select-border-width: $input-btn-border-width !default; -$custom-select-border-color: $input-border-color !default; -$custom-select-border-radius: 1.5rem !default; - -$custom-select-focus-border-color: lighten(theme-color("primary"), 25%) !default; -$custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, 0.075), - 0 0 5px rgba($custom-select-focus-border-color, 0.5) !default; - -$custom-select-font-size-sm: 75% !default; -$custom-select-height-sm: $input-height-sm !default; - -$custom-file-height: $input-height !default; -$custom-file-width: 14rem !default; -$custom-file-focus-box-shadow: 0 0 0 0.075rem $white, - 0 0 0 0.2rem theme-color("primary") !default; - -$custom-file-padding-y: $input-btn-padding-y !default; -$custom-file-padding-x: $input-btn-padding-x !default; -$custom-file-line-height: $input-btn-line-height !default; -$custom-file-color: $input-color !default; -$custom-file-bg: $input-bg !default; -$custom-file-border-width: $input-btn-border-width !default; -$custom-file-border-color: $input-border-color !default; -$custom-file-border-radius: $input-border-radius !default; -$custom-file-box-shadow: $input-box-shadow !default; -$custom-file-button-color: $custom-file-color !default; -$custom-file-button-bg: $input-group-addon-bg !default; -$custom-file-text: ( - placeholder: (en: "Choose file..."), - button-label: (en: "Browse") - ) - !default; - -// Form validation -$form-feedback-valid-color: theme-color("success") !default; -$form-feedback-invalid-color: theme-color("danger") !default; - -// Dropdowns -// -// Dropdown menu container and contents. - -$dropdown-min-width: 10rem !default; -$dropdown-padding-y: 0.5rem !default; -$dropdown-spacer: 0.125rem !default; -$dropdown-bg: $white !default; -$dropdown-border-color: rgba($black, 0.15) !default; -$dropdown-border-width: $border-width !default; -$dropdown-divider-bg: $gray-200 !default; -$dropdown-box-shadow: 0 0.5rem 1rem rgba($black, 0.175) !default; - -$dropdown-link-color: $gray-900 !default; -$dropdown-link-hover-color: darken($gray-900, 5%) !default; -$dropdown-link-hover-bg: $gray-300 !default; - -$dropdown-link-active-color: $component-active-color !default; -$dropdown-link-active-bg: $component-active-bg !default; - -$dropdown-link-disabled-color: $gray-600 !default; - -$dropdown-item-padding-y: 0.25rem !default; -$dropdown-item-padding-x: 1.5rem !default; - -$dropdown-header-color: $gray-600 !default; - -// Z-index master list -// -// Warning: Avoid customizing these values. They're used for a bird's eye view -// of components dependent on the z-axis and are designed to all work together. - -$zindex-dropdown: 1000 !default; -$zindex-sticky: 1020 !default; -$zindex-fixed: 1030 !default; -$zindex-modal-backdrop: 1040 !default; -$zindex-modal: 1050 !default; -$zindex-popover: 1060 !default; -$zindex-tooltip: 1070 !default; - -// Navs - -$nav-link-padding-y: 0.5rem !default; -$nav-link-padding-x: 1rem !default; -$nav-link-disabled-color: $gray-600 !default; - -$nav-tabs-border-color: #ddd !default; -$nav-tabs-border-width: $border-width !default; -$nav-tabs-border-radius: $border-radius !default; -$nav-tabs-link-hover-border-color: $gray-200 !default; -$nav-tabs-link-active-color: $gray-700 !default; -$nav-tabs-link-active-bg: $body-bg !default; -$nav-tabs-link-active-border-color: #ddd !default; - -$nav-pills-border-radius: 1.5rem !default; -$nav-pills-link-active-color: $component-active-color !default; -$nav-pills-link-active-bg: $component-active-bg !default; - -// Navbar - -$navbar-padding-y: ($spacer / 2) !default; -$navbar-padding-x: $spacer !default; - -$navbar-brand-font-size: $font-size-lg !default; -// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link -$nav-link-height: $navbar-brand-font-size * $line-height-base !default; -$navbar-brand-height: ( - $font-size-base * $line-height-base + $nav-link-padding-y * 2 - ) - !default; -$navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default; - -$navbar-toggler-padding-y: 0.25rem !default; -$navbar-toggler-padding-x: 0.75rem !default; -$navbar-toggler-font-size: $font-size-lg !default; -$navbar-toggler-border-radius: $btn-border-radius !default; - -$navbar-dark-color: rgba($white, 0.5) !default; -$navbar-dark-hover-color: rgba($white, 0.75) !default; -$navbar-dark-active-color: rgba($white, 1) !default; -$navbar-dark-disabled-color: rgba($white, 0.25) !default; -$navbar-dark-toggler-icon-bg: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; -$navbar-dark-toggler-border-color: rgba($white, 0.1) !default; - -$navbar-light-color: rgba($black, 0.5) !default; -$navbar-light-hover-color: rgba($black, 0.7) !default; -$navbar-light-active-color: rgba($black, 0.9) !default; -$navbar-light-disabled-color: rgba($black, 0.3) !default; -$navbar-light-toggler-icon-bg: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; -$navbar-light-toggler-border-color: rgba($black, 0.1) !default; - -// Pagination - -$pagination-padding-y: 0.5rem !default; -$pagination-padding-x: 0.75rem !default; -$pagination-padding-y-sm: 0.25rem !default; -$pagination-padding-x-sm: 0.5rem !default; -$pagination-padding-y-lg: 0.75rem !default; -$pagination-padding-x-lg: 1.5rem !default; -$pagination-line-height: 1.25 !default; - -$pagination-color: $link-color !default; -$pagination-bg: $white !default; -$pagination-border-width: $border-width !default; -$pagination-border-color: #ddd !default; - -$pagination-hover-color: $link-hover-color !default; -$pagination-hover-bg: $gray-200 !default; -$pagination-hover-border-color: #ddd !default; - -$pagination-active-color: $white !default; -$pagination-active-bg: theme-color("primary") !default; -$pagination-active-border-color: theme-color("primary") !default; - -$pagination-disabled-color: $gray-600 !default; -$pagination-disabled-bg: $white !default; -$pagination-disabled-border-color: #ddd !default; - -// Jumbotron - -$jumbotron-padding: 2rem !default; -$jumbotron-bg: $gray-200 !default; - -// Cards - -$card-spacer-y: 0.75rem !default; -$card-spacer-x: 1.25rem !default; -$card-border-width: $border-width !default; -$card-border-radius: $border-radius !default; -$card-border-color: rgba($black, 0.125) !default; -$card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) - !default; -$card-cap-bg: rgba($black, 0.03) !default; -$card-bg: $white !default; - -$card-img-overlay-padding: 1.25rem !default; - -$card-group-margin: ($grid-gutter-width / 2) !default; -$card-deck-margin: $card-group-margin !default; - -$card-columns-count: 3 !default; -$card-columns-gap: 1.25rem !default; -$card-columns-margin: $card-spacer-y !default; - -// Tooltips - -$tooltip-max-width: 200px !default; -$tooltip-color: $white !default; -$tooltip-bg: $black !default; -$tooltip-opacity: 0.9 !default; -$tooltip-padding-y: 3px !default; -$tooltip-padding-x: 8px !default; -$tooltip-margin: 0 !default; - -$tooltip-arrow-width: 5px !default; -$tooltip-arrow-height: 5px !default; -$tooltip-arrow-color: $tooltip-bg !default; - -// Popovers - -$popover-inner-padding: 1px !default; -$popover-bg: $white !default; -$popover-max-width: 276px !default; -$popover-border-width: $border-width !default; -$popover-border-color: rgba($black, 0.2) !default; -$popover-box-shadow: 0 5px 10px rgba($black, 0.2) !default; - -$popover-header-bg: darken($popover-bg, 3%) !default; -$popover-header-color: $headings-color !default; -$popover-header-padding-y: 8px !default; -$popover-header-padding-x: 14px !default; - -$popover-body-color: $body-color !default; -$popover-body-padding-y: 9px !default; -$popover-body-padding-x: 14px !default; - -$popover-arrow-width: 10px !default; -$popover-arrow-height: 5px !default; -$popover-arrow-color: $popover-bg !default; - -$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default; -$popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; - -// Badges - -$badge-font-size: 75% !default; -$badge-font-weight: $font-weight-bold !default; -$badge-padding-y: 0.25em !default; -$badge-padding-x: 0.4em !default; - -$badge-pill-padding-x: 0.6em !default; -// Use a higher than normal value to ensure completely rounded edges when -// customizing padding or font-size on labels. -$badge-pill-border-radius: 10rem !default; - -// Modals - -// Padding applied to the modal body -$modal-inner-padding: 15px !default; - -$modal-dialog-margin: 10px !default; -$modal-dialog-margin-y-sm-up: 30px !default; - -$modal-title-line-height: $line-height-base !default; - -$modal-content-bg: $white !default; -$modal-content-border-color: rgba($black, 0.2) !default; -$modal-content-border-width: $border-width !default; -$modal-content-box-shadow-xs: 0 3px 9px rgba($black, 0.5) !default; -$modal-content-box-shadow-sm-up: 0 5px 15px rgba($black, 0.5) !default; - -$modal-backdrop-bg: $black !default; -$modal-backdrop-opacity: 0.5 !default; -$modal-header-border-color: $gray-200 !default; -$modal-footer-border-color: $modal-header-border-color !default; -$modal-header-border-width: $modal-content-border-width !default; -$modal-footer-border-width: $modal-header-border-width !default; -$modal-header-padding: 15px !default; - -$modal-lg: 800px !default; -$modal-md: 500px !default; -$modal-sm: 300px !default; - -$modal-transition: transform 0.3s ease-out !default; - -// Alerts -// -// Define alert colors, border radius, and padding. - -$alert-padding-y: 0.75rem !default; -$alert-padding-x: 1.25rem !default; -$alert-margin-bottom: 1rem !default; -$alert-border-radius: $border-radius !default; -$alert-link-font-weight: $font-weight-bold !default; -$alert-border-width: $border-width !default; - -// Progress bars - -$progress-height: 1rem !default; -$progress-font-size: 0.75rem !default; -$progress-bg: $gray-200 !default; -$progress-border-radius: $border-radius !default; -$progress-box-shadow: inset 0 0.1rem 0.1rem rgba($black, 0.1) !default; -$progress-bar-color: $white !default; -$progress-bar-bg: theme-color("primary") !default; -$progress-bar-animation-timing: 1s linear infinite !default; -$progress-bar-transition: width 0.6s ease !default; - -// List group - -$list-group-bg: $white !default; -$list-group-border-color: rgba($black, 0.125) !default; -$list-group-border-width: $border-width !default; -$list-group-border-radius: $border-radius !default; - -$list-group-item-padding-y: 0.75rem !default; -$list-group-item-padding-x: 1.25rem !default; - -$list-group-hover-bg: $gray-100 !default; -$list-group-active-color: $component-active-color !default; -$list-group-active-bg: $component-active-bg !default; -$list-group-active-border-color: $list-group-active-bg !default; - -$list-group-disabled-color: $gray-600 !default; -$list-group-disabled-bg: $list-group-bg !default; - -$list-group-action-color: $gray-700 !default; -$list-group-action-hover-color: $list-group-action-color !default; - -$list-group-action-active-color: $body-color !default; -$list-group-action-active-bg: $gray-200 !default; - -// Image thumbnails - -$thumbnail-padding: 0.25rem !default; -$thumbnail-bg: $body-bg !default; -$thumbnail-border-width: $border-width !default; -$thumbnail-border-color: #ddd !default; -$thumbnail-border-radius: $border-radius !default; -$thumbnail-box-shadow: 0 1px 2px rgba($black, 0.075) !default; -$thumbnail-transition: all 0.2s ease-in-out !default; - -// Figures - -$figure-caption-font-size: 90% !default; -$figure-caption-color: $gray-600 !default; - -// Breadcrumbs - -$breadcrumb-padding-y: 0.75rem !default; -$breadcrumb-padding-x: 1rem !default; -$breadcrumb-item-padding: 0.5rem !default; - -$breadcrumb-margin-bottom: 1rem !default; - -$breadcrumb-bg: $gray-200 !default; -$breadcrumb-divider-color: $gray-600 !default; -$breadcrumb-active-color: $gray-600 !default; -$breadcrumb-divider: "/" !default; - -// Carousel - -$carousel-control-color: $white !default; -$carousel-control-width: 15% !default; -$carousel-control-opacity: 0.5 !default; - -$carousel-indicator-width: 30px !default; -$carousel-indicator-height: 3px !default; -$carousel-indicator-spacer: 3px !default; -$carousel-indicator-active-bg: $white !default; - -$carousel-caption-width: 70% !default; -$carousel-caption-color: $white !default; - -$carousel-control-icon-width: 20px !default; - -$carousel-control-prev-icon-bg: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; -$carousel-control-next-icon-bg: str-replace( - url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"), - "#", - "%23" - ) - !default; - -$carousel-transition: transform 0.6s ease !default; - -// Close - -$close-font-size: $font-size-base * 1.5 !default; -$close-font-weight: $font-weight-bold !default; -$close-color: $black !default; -$close-text-shadow: 0 1px 0 $white !default; - -// Code - -$code-font-size: 90% !default; -$code-padding-y: 0.2rem !default; -$code-padding-x: 0.4rem !default; -$code-color: #bd4147 !default; -$code-bg: $gray-100 !default; - -$kbd-color: $white !default; -$kbd-bg: $gray-900 !default; - -$pre-color: $gray-900 !default; -$pre-scrollable-max-height: 340px !default; diff --git a/app/assets/v2/css/about.css b/app/assets/v2/css/about.css index c4a8ec0d317..d41201a85fd 100644 --- a/app/assets/v2/css/about.css +++ b/app/assets/v2/css/about.css @@ -24,8 +24,8 @@ h4 { #jobs p, #origin_story p { text-align: center; - font-family: "Muli", sans-serif; } + .grow_hero img{ width: 100%; max-width: 400px; @@ -163,73 +163,4 @@ h4 { #jobs .left { margin-bottom: 2em; } -} - -/* TODO: Clean up CSS*/ - -div.teamProfileLeft, -div.communityProfile { - background-color: #eff4ee; - padding: 1em; - margin-bottom: 2em; - box-shadow: 0px 2px 5px 0px #808080; -} - -div.teamProfileRight { - background-color: #eff4ee; - padding: 1em; - margin-bottom: 2em; - box-shadow: 0px 2px 5px 0px #808080; -} - -@media screen and (min-width: 48em) { - div.teamProfileLeft { - margin-left: 40%; - } - - div.teamProfileRight { - margin-right: 40%; - } -} - -img.teamProfileAvatar, -img.communityProfileAvatar { - margin: 0.5em; - max-height: 200px; - border-radius: 50%; - border-width: 5px; - border-style: solid; - border-color: #ffffff; -} - -img.teamProfileSocialImg, -img.communityProfileAvatarSocialImg { - max-height: 30px; - margin: 0px 2px 10px 2px; -} - -img.teamProfileSocialImg:hover, -img.communityProfileAvatarSocialImg { - opacity: 0.75; -} - -div.communityProfile { - width: 10%; - display: inline-block; - background-color: #eee; -} -@media screen and (max-width: 1100px) { - div.communityProfile { - width: 20% - } - @media screen and (max-width: 700px) { - div.communityProfile { - width: 20% - } - @media screen and (max-width: 500px) { - div.communityProfile { - width: 31% - } - - - }}} +} \ No newline at end of file diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index 812098cd552..d3f2b12efe5 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -120,7 +120,6 @@ span { } .modal { - font-family: "Muli", sans-serif; z-index: 9; border-radius: 4px !important; } @@ -603,8 +602,8 @@ input[type=text].loading { .submit_bounty .select2-results__option, .fulfill_bounty .select2-results__option { font-size: 0.875rem; - font-family: "Muli", sans-serif; } + .select2-results__option:empty { padding: 1px; border-bottom: solid 1px darkgray; @@ -678,7 +677,6 @@ input[type=text].loading { box-shadow: 0 6px 6px 0 rgba(0, 0, 0, 0.24); color: white; display: flex; - font-family: 'Muli', sans-serif; justify-content: space-between; padding: 20px; margin-bottom: 1px; @@ -692,6 +690,7 @@ input[type=text].loading { align-items: center; display: flex; } + .alert .message .content{ display: inline; } @@ -940,7 +939,6 @@ input.is-invalid { } .tooltip-info { - font-family: 'Muli', sans-serif; padding: 10px 20px; margin: 0; width: 25em; @@ -994,7 +992,6 @@ input.is-invalid { text-transform: uppercase; font-size: 14px; padding: 4px 7px; - font-family: 'Muli', sans-serif; font-weight: 100; letter-spacing: 0.15em; margin: 5px; @@ -1054,7 +1051,6 @@ input.is-invalid { .submit-notification { color: #fff; - font-family: 'Muli', sans-serif; font-size: 10px !important; min-height: 100px; padding: 0.6rem; @@ -1181,20 +1177,6 @@ input.is-invalid { width: 130px; } - .whitepaper .row .col-1, - .whitepaper .row .col-4 { - display: none; - } - - .whitepaper .row .col-6 { - width: 90%; - flex: 0 0 90%; - max-width: 90%; - padding-left: 10px; - padding-right: 10px; - margin: 0 auto; - } - .bounty_def .col-7 { width: 80%; flex: 0 0 80%; @@ -1498,10 +1480,6 @@ input.is-invalid { display: none; } - .search_bar .save_search { - display: none; - } - .interior .body { width: 100%; flex: 0 0 100%; @@ -1548,9 +1526,7 @@ input.is-invalid { /* End TODO */ /* Results */ -.results { - font-family: 'Muli', sans-serif; -} + .results h2 { font-size: 1.8rem; font-weight: 700; diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index 752061f775e..2687cc17f63 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -1,5 +1,4 @@ body { - font-family: 'Muli', sans-serif; background-color: #FFF; } @@ -89,7 +88,6 @@ body { text-align: center; font-size: 16px; color: #7A7A7A; - font-family: 'Muli', sans-serif; font-weight: 600; } @@ -109,7 +107,6 @@ body { } .bounty-heading { - font-family: 'Muli', sans-serif; font-weight: 600; margin-bottom: 1em; margin-top: 2em; @@ -156,7 +153,6 @@ body { .bounty-info div { display: inline; margin-right: 15px; - font-family: 'Muli', sans-serif; font-weight: 300; } @@ -225,7 +221,6 @@ body { } .transaction-status { - font-family: 'Muli', sans-serif; display: block; position: relative; width: 80%; @@ -236,11 +231,11 @@ body { padding: 3vh 5vw; text-align: center; } + .transaction-status a{ color: white; } - .red_warning, #network { background-color: #fbe0d6; @@ -296,7 +291,6 @@ body { color: #333333; letter-spacing: 0; text-transform: capitalize; - font-family: 'Muli', sans-serif; font-weight: 600; } @@ -315,7 +309,6 @@ body { color: #0D0764; margin-bottom: 5px; text-transform: capitalize; - font-family: 'Muli', sans-serif; font-weight: 600; } @@ -672,7 +665,6 @@ a.btn { } .transaction-header { - font-family: 'Muli', sans-serif; display: block; position: relative; width: 80%; diff --git a/app/assets/v2/css/box_redeem.css b/app/assets/v2/css/box_redeem.css index aa87adb421f..46dc5ea41d9 100644 --- a/app/assets/v2/css/box_redeem.css +++ b/app/assets/v2/css/box_redeem.css @@ -1,6 +1,5 @@ #main { - font-family: 'Muli', sans-serif; max-width: 100%; min-width: 27em; padding: 4.5em 3em 3em 3em; @@ -27,12 +26,10 @@ } #main #ens_subdomain h1 { - font-family: 'Muli', sans-serif; letter-spacing: 0; } #main #ens_subdomain h2 { - font-family: 'Muli', sans-serif; text-transform: none; } diff --git a/app/assets/v2/css/card.css b/app/assets/v2/css/card.css index 5ab44bba5d2..0e0e189b7d7 100644 --- a/app/assets/v2/css/card.css +++ b/app/assets/v2/css/card.css @@ -3,7 +3,6 @@ display: flex; justify-content: center; align-items: center; - font-family: Muli, sans-serif; font-weight: 600; } @@ -118,7 +117,6 @@ } .card .content .title { - font-family: 'OpenSans', sans-serif; margin-bottom: 10px; } diff --git a/app/assets/v2/css/colors.css b/app/assets/v2/css/colors.css index 7b95286d537..4847a6ba3b1 100644 --- a/app/assets/v2/css/colors.css +++ b/app/assets/v2/css/colors.css @@ -9,3 +9,31 @@ --text-light: #D8D8D8; --text-dark: #666; /* 😈 */ } + +.text-highlight-purple { + color: #8E2ABE; +} + +.text-highlight-green { + color: #12c971; +} + +.text-highlight-dark-blue { + color: #220e90; +} + +.text-highlight-gc-purple { + color: var(--gc-purple); +} + +.text-highlight-gc-blue { + color: var(--gc-blue); +} + +.text-highlight-light-blue { + color: #1A96D5; +} + +.text-highlight-pink { + color: #da086b; +} diff --git a/app/assets/v2/css/dashboard.css b/app/assets/v2/css/dashboard.css index 3472baf22c2..e17b9ac8866 100644 --- a/app/assets/v2/css/dashboard.css +++ b/app/assets/v2/css/dashboard.css @@ -1,5 +1,4 @@ body { - font-family: 'Muli', sans-serif; background: #FFFFFF; } @@ -90,13 +89,11 @@ body { #stats { padding-left: 5px; - font-family: 'Muli', sans-serif; font-weight: 300; color: #7A7A7A; } #matches { - font-family: 'Muli', sans-serif; font-weight: 300; padding-left: 10px; } @@ -164,7 +161,6 @@ body { } .bounty-detail .info { - font-family: 'Muli', sans-serif; font-weight: 300; color: #666666; } diff --git a/app/assets/v2/css/external_bounties/bounties.css b/app/assets/v2/css/external_bounties/bounties.css index 7ca94768419..ac10aa6cb8c 100644 --- a/app/assets/v2/css/external_bounties/bounties.css +++ b/app/assets/v2/css/external_bounties/bounties.css @@ -137,7 +137,6 @@ .bounties-header__title .sub-title, .aside .title, .aside .sub-title { - font-family: 'futura-pt', sans-serif; text-transform: uppercase; font-weight: bolder; letter-spacing: 0; @@ -307,7 +306,6 @@ border-radius: 30px 0 0 30px; display: flex; color: #fff; - font-family: 'futura-pt', sans-serif; font-weight: bolder; justify-content: space-around; text-align: right; @@ -355,7 +353,6 @@ .bounty__fiat-price { color: #15D17C; - font-family: 'futura-pt', sans-serif; font-size: 0.9rem; font-weight: bolder; padding: 0 0.5em; diff --git a/app/assets/v2/css/external_bounties/bounty.css b/app/assets/v2/css/external_bounties/bounty.css index 531329e6dad..1defd129215 100644 --- a/app/assets/v2/css/external_bounties/bounty.css +++ b/app/assets/v2/css/external_bounties/bounty.css @@ -28,7 +28,6 @@ } .bounty-container .sub-title { - font-family: 'futura-pt', sans-serif; text-transform: none; letter-spacing: 0; margin-bottom: 1rem; @@ -63,7 +62,6 @@ .bounty__crypto-price, .bounty__fiat-price { - font-family: 'futura-pt', sans-serif; text-transform: none; font-weight: bolder; letter-spacing: 0; diff --git a/app/assets/v2/css/forms/button.css b/app/assets/v2/css/forms/button.css index e9da480cd4a..ed42273ec4f 100644 --- a/app/assets/v2/css/forms/button.css +++ b/app/assets/v2/css/forms/button.css @@ -5,7 +5,6 @@ color: #fff; cursor: pointer; font-size: 14px; - font-family: 'Muli', sans-serif; font-weight: 300; padding: 10px 20px; -webkit-appearance: none; diff --git a/app/assets/v2/css/forms/input.css b/app/assets/v2/css/forms/input.css index 382a94e78f8..400b968671c 100644 --- a/app/assets/v2/css/forms/input.css +++ b/app/assets/v2/css/forms/input.css @@ -3,7 +3,6 @@ border-radius: 3px; border: 1px solid #0D0764; font-size: 14px; - font-family: 'Muli', sans-serif; padding: 5px 7px; width: 100%; } @@ -61,12 +60,13 @@ .form__input-help { color: #868e96; font-size: 12px; - font-family: 'Muli', sans-serif; } + .form__input-help--dynamic { margin-top: 5px; display: block; } + .amount_container{ height: 100px; } diff --git a/app/assets/v2/css/forms/label.css b/app/assets/v2/css/forms/label.css index e8360b9fa85..4b422bab44e 100644 --- a/app/assets/v2/css/forms/label.css +++ b/app/assets/v2/css/forms/label.css @@ -1,7 +1,3 @@ -label { - font-family: 'Muli', sans-serif; -} - .form__label { font-size: 12px; margin: .5rem 0; diff --git a/app/assets/v2/css/forms/select.css b/app/assets/v2/css/forms/select.css index 51d4958aad0..f3aca65bbb3 100644 --- a/app/assets/v2/css/forms/select.css +++ b/app/assets/v2/css/forms/select.css @@ -6,7 +6,6 @@ .form__select2 { display: flex; - font-family: 'Muli', sans-serif; height: 100%; } @@ -32,7 +31,6 @@ border-radius: 3px; display: inline-block; font-size: 14px; - font-family: 'Muli', sans-serif; height: 37px; outline: none; width: 100%; diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index 30a923cd4c0..cca8938b644 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -1,134 +1,8 @@ -/* Futura */ - -@font-face { - font-family: 'futura-pt'; - src: url('/static/v2/fonts/futura/font4.ttf')/* TTF file for CSS3 browsers */ -} - -/* OpenSans Light */ - -@font-face { - font-family: 'OpenSans'; - src: url('/static/v2/fonts/OpenSans/Light.ttf'); - font-weight: 300; -} - -/* OpenSans Regular */ - -@font-face { - font-family: 'OpenSans'; - src: url('/static/v2/fonts/OpenSans/Regular.ttf'); - font-weight: 400; -} - -/* OpenSans Semibold */ - -@font-face { - font-family: 'OpenSans'; - src: url('/static/v2/fonts/OpenSans/SemiBold.ttf'); - font-weight: 600; -} - -/* OpenSans Bold */ - -@font-face { - font-family: 'OpenSans'; - src: url('/static/v2/fonts/OpenSans/Bold.ttf'); - font-weight: 700; -} - -/* Muli Extra Light */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/ExtraLight.ttf'); - font-weight: 200; -} */ - -/* Muli Extra Light Italic */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/ExtraLightItalic.ttf'); - font-weight: 200; - font-style: italic -} */ - -/* Muli Light */ - -@font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/Light.ttf'); - font-weight: 300; -} - -/* Muli Light Italic */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/LightItalic.ttf'); - font-weight: 300; - font-style: italic; -} */ - -/* Muli Regular */ - -@font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/Regular.ttf'); - font-weight: 400; -} - -/* Muli Regular Italic */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/RegularItalic.ttf'); - font-weight: 400; - font-style: italic; -} */ - -/* Muli SemiBold */ - -@font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/SemiBold.ttf'); - font-weight: 600; -} - -/* Muli SemiBold Italic */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/SemiBoldItalic.ttf'); - font-weight: 600; - font-style: italic; -} */ - -/* Muli Bold */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/Bold.ttf'); - font-weight: 700; -} */ - -/* Muli Bold Italic */ - -/* @font-face { - font-family: 'Muli'; - src: url('/static/v2/fonts/Muli/BoldItalic.ttf'); - font-weight: 700; - font-style: italic; -} */ - body { - font-family: Muli, sans-serif; + font-family: 'Muli', sans-serif; overflow-x: hidden; width: 100%; background-color: #fff; - - /* better font render */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } @@ -292,7 +166,6 @@ div.button-pink { .header-line { color: #12c971; - font-family: Muli, sans-serif; font-size: 2em; font-weight: 500; font-style: italic; @@ -306,7 +179,6 @@ div.button-pink { .subheader-line { color: #70efbe; - font-family: Muli, sans-serif; font-size: 1.5em; font-weight: 500; font-style: italic; @@ -608,7 +480,6 @@ div.button-pink { .dropdown-menu { background-color: #FAFAFA; - font-family: 'Muli', sans-serif; border-radius: 0px; padding: 0; right: 0; @@ -707,7 +578,6 @@ div.button-pink { text-align: left; margin-top: auto; margin-bottom: auto; - font-family:'Muli', sans-serif; letter-spacing: 0; } @@ -722,7 +592,6 @@ div.button-pink { } #ios-banner .row .left a { - font-family: 'Muli', sans-serif; font-size: 14px; } diff --git a/app/assets/v2/css/howitworks.css b/app/assets/v2/css/howitworks.css index 368b5416473..6ad7a35d4a4 100644 --- a/app/assets/v2/css/howitworks.css +++ b/app/assets/v2/css/howitworks.css @@ -59,23 +59,6 @@ h2 { bottom: -4em; } -.how-it-works__fake_but { - border: none; - border-radius: 2px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); - color: #fff; - font-size: 14px; - font-family: 'Muli', sans-serif; - font-weight: 300; - padding: 8px 16px; - -webkit-appearance: none; - background-color: #0D0764; - margin-bottom: 1em; - position: absolute; - right: 0px; - bottom: 0px; -} - .how-it-works__step-number, .how-it-works__step-exclamation, .how-it-works__step-wait { diff --git a/app/assets/v2/css/ios.css b/app/assets/v2/css/ios.css index aa8d1c8e222..f820294ed6f 100644 --- a/app/assets/v2/css/ios.css +++ b/app/assets/v2/css/ios.css @@ -46,7 +46,6 @@ } .ios-hero__container .header-line p { - font-family: 'futura-pt', sans-serif; font-size: 2em; } diff --git a/app/assets/v2/css/jquery-ui.css b/app/assets/v2/css/jquery-ui.css index 810f9201826..4dc6671a18c 100644 --- a/app/assets/v2/css/jquery-ui.css +++ b/app/assets/v2/css/jquery-ui.css @@ -1012,7 +1012,7 @@ body .ui-tooltip { ----------------------------------*/ .ui-widget { - font-family: Arial, Helvetica, sans-serif; + font-family: 'Muli', Helvetica, sans-serif; font-size: 1em; } @@ -1024,7 +1024,7 @@ body .ui-tooltip { .ui-widget select, .ui-widget textarea, .ui-widget button { - font-family: Arial, Helvetica, sans-serif; + font-family: 'Muli', Helvetica, sans-serif; font-size: 1em; } diff --git a/app/assets/v2/css/lib/typography.css b/app/assets/v2/css/lib/typography.css new file mode 100644 index 00000000000..5d40aa7721e --- /dev/null +++ b/app/assets/v2/css/lib/typography.css @@ -0,0 +1,17 @@ +@font-face { + font-family: 'futura-pt'; + src: url('/static/v2/fonts/futura/font4.ttf')/* TTF file for CSS3 browsers */ +} + +@font-face { + font-family: 'Muli'; + src: url('/static/v2/fonts/Muli/Regular.ttf'); +} + +.g-font-futura { + font-family: 'futura-pt', sans-serif; +} + +.g-font-muli { + font-family: 'Muli', sans-serif; +} diff --git a/app/assets/v2/css/mission.css b/app/assets/v2/css/mission.css index c02ed84fbc8..41bd21103b9 100644 --- a/app/assets/v2/css/mission.css +++ b/app/assets/v2/css/mission.css @@ -82,7 +82,6 @@ .mission .icon-text { font-weight: 500; font-size: 18px; - font-family: futura-pt, sans-serif; color: #666666; } diff --git a/app/assets/v2/css/newsletter.css b/app/assets/v2/css/newsletter.css index c031cec52e7..e0a061bc5a6 100644 --- a/app/assets/v2/css/newsletter.css +++ b/app/assets/v2/css/newsletter.css @@ -1,13 +1,11 @@ .newsletter { margin-top: 1em; border-top: 1px solid #eee; - font-family: Muli, sans-serif; } .newsletter h4 { letter-spacing: 0; font-size: 20px; - font-family: Muli, sans-serif; font-weight: 700; text-transform: none; } diff --git a/app/assets/v2/css/onboard.css b/app/assets/v2/css/onboard.css index a1404d00705..be34c0d439d 100644 --- a/app/assets/v2/css/onboard.css +++ b/app/assets/v2/css/onboard.css @@ -1,6 +1,5 @@ body { background-color: #fff; - font-family: Muli, sans-serif; } h2, h3 { diff --git a/app/assets/v2/css/search_bar.css b/app/assets/v2/css/search_bar.css index 563d93ef472..fe348e53432 100644 --- a/app/assets/v2/css/search_bar.css +++ b/app/assets/v2/css/search_bar.css @@ -11,13 +11,13 @@ bottom: 2px; } -.save_search, .order_by { color: #000; - font-family: 'Muli', sans-serif; font-weight: 600; position: relative; bottom: 2px; + margin-top: 26px; + text-align: right; } .search-area, @@ -31,11 +31,6 @@ margin-top: 15px; } -.order_by { - margin-top: 26px; - text-align: right; -} - .order_by .heading { color: #5B5C5C; } diff --git a/app/assets/v2/css/sidebar_search.css b/app/assets/v2/css/sidebar_search.css index 99e3132ff89..53f339ef8c4 100644 --- a/app/assets/v2/css/sidebar_search.css +++ b/app/assets/v2/css/sidebar_search.css @@ -9,7 +9,6 @@ margin-top: 10px; margin-bottom: 10px; text-transform: uppercase; - font-family: 'Muli', sans-serif; font-weight: 600; } diff --git a/app/assets/v2/css/toolbox.css b/app/assets/v2/css/toolbox.css index a2ea4d824c0..7e74f40a2dc 100644 --- a/app/assets/v2/css/toolbox.css +++ b/app/assets/v2/css/toolbox.css @@ -1,7 +1,6 @@ .body { padding: 60px 100px !important; background-color: #fefefe !important; - font-family: 'Muli', sans-serif; } .description { @@ -11,7 +10,6 @@ .title, .sub-title { - font-family: 'Muli', sans-serif; font-weight: 600; text-transform: none; letter-spacing: 0; diff --git a/app/assets/v2/css/typography.css b/app/assets/v2/css/typography.css deleted file mode 100644 index 15dbc15693d..00000000000 --- a/app/assets/v2/css/typography.css +++ /dev/null @@ -1,27 +0,0 @@ -.text-highlight-purple { - color: #8E2ABE; -} - -.text-highlight-green { - color: #12c971; -} - -.text-highlight-dark-blue { - color: #220e90; -} - -.text-highlight-gc-purple { - color: var(--gc-purple); -} - -.text-highlight-gc-blue { - color: var(--gc-blue); -} - -.text-highlight-light-blue { - color: #1A96D5; -} - -.text-highlight-pink { - color: #da086b; -} diff --git a/app/assets/v2/fonts/OpenSans/Bold.ttf b/app/assets/v2/fonts/OpenSans/Bold.ttf deleted file mode 100644 index 7b529456032..00000000000 Binary files a/app/assets/v2/fonts/OpenSans/Bold.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/OpenSans/ExtraBold.ttf b/app/assets/v2/fonts/OpenSans/ExtraBold.ttf deleted file mode 100644 index 3660681d398..00000000000 Binary files a/app/assets/v2/fonts/OpenSans/ExtraBold.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/OpenSans/Light.ttf b/app/assets/v2/fonts/OpenSans/Light.ttf deleted file mode 100644 index 563872c7680..00000000000 Binary files a/app/assets/v2/fonts/OpenSans/Light.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/OpenSans/Regular.ttf b/app/assets/v2/fonts/OpenSans/Regular.ttf deleted file mode 100644 index 2e31d02424e..00000000000 Binary files a/app/assets/v2/fonts/OpenSans/Regular.ttf and /dev/null differ diff --git a/app/assets/v2/fonts/OpenSans/SemiBold.ttf b/app/assets/v2/fonts/OpenSans/SemiBold.ttf deleted file mode 100644 index 99db86aa028..00000000000 Binary files a/app/assets/v2/fonts/OpenSans/SemiBold.ttf and /dev/null differ diff --git a/app/assets/v2/js/dataviz/heatmap.css b/app/assets/v2/js/dataviz/heatmap.css index c8bf62f1b75..93444f72158 100644 --- a/app/assets/v2/js/dataviz/heatmap.css +++ b/app/assets/v2/js/dataviz/heatmap.css @@ -1,4 +1,4 @@ -body{font-family:arial, 'Hiragino Sans GB',Tahoma, Arial, Helvetica, STHeiti;font-size: 14px;} +body{font-size: 14px;} .days-hours-heatmap{padding: 20px 0 20px 0;width: 500px;margin: 0 auto;} .days-hours-heatmap .calibration{margin-bottom: 15px;width:400px;} .days-hours-heatmap .calibration .group{display: inline-block;} diff --git a/app/assets/v2/js/dataviz/sequences.css b/app/assets/v2/js/dataviz/sequences.css index dd489d2e2ee..fb6db0d5ead 100644 --- a/app/assets/v2/js/dataviz/sequences.css +++ b/app/assets/v2/js/dataviz/sequences.css @@ -1,5 +1,4 @@ body { - font-family: 'Open Sans', sans-serif; font-size: 12px; font-weight: 400; background-color: #fff; diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js index da0ba6212c0..e9c7354952f 100644 --- a/app/assets/v2/js/shared.js +++ b/app/assets/v2/js/shared.js @@ -215,7 +215,7 @@ var _alert = function(msg, _class) { var html = function() { return ( - `
+ `
${alertMessage(msg)} diff --git a/app/bounty_requests/templates/bounty_request_form.html b/app/bounty_requests/templates/bounty_request_form.html index cb08d480a8d..ae6e1c25cd8 100644 --- a/app/bounty_requests/templates/bounty_request_form.html +++ b/app/bounty_requests/templates/bounty_request_form.html @@ -21,7 +21,7 @@ {% include 'shared/head.html' %} {% include 'shared/cards.html' %} - +
{% include 'shared/nav.html' %}
diff --git a/app/dashboard/templates/bounty/change.html b/app/dashboard/templates/bounty/change.html index 4a221c1f670..3fc52eb7b0e 100644 --- a/app/dashboard/templates/bounty/change.html +++ b/app/dashboard/templates/bounty/change.html @@ -22,7 +22,7 @@ {% include 'shared/cards.html' %} - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html index c7719f907c2..dc4018e2e5c 100644 --- a/app/dashboard/templates/bounty/details.html +++ b/app/dashboard/templates/bounty/details.html @@ -9,7 +9,7 @@ - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/bounty/fulfill.html b/app/dashboard/templates/bounty/fulfill.html index c2024ed2d75..072ee774432 100644 --- a/app/dashboard/templates/bounty/fulfill.html +++ b/app/dashboard/templates/bounty/fulfill.html @@ -22,7 +22,7 @@ {% include 'shared/head.html' %} {% include 'shared/cards.html' %} - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/bounty/increase.html b/app/dashboard/templates/bounty/increase.html index 612e07e93cb..912a47ccaf2 100644 --- a/app/dashboard/templates/bounty/increase.html +++ b/app/dashboard/templates/bounty/increase.html @@ -24,7 +24,7 @@ {% include 'shared/cards.html' %} - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/bounty/invoice.html b/app/dashboard/templates/bounty/invoice.html index 2a00233c391..eab175579b6 100644 --- a/app/dashboard/templates/bounty/invoice.html +++ b/app/dashboard/templates/bounty/invoice.html @@ -15,9 +15,9 @@ box-shadow: 0 0 10px rgba(0, 0, 0, .15); font-size: 16px; line-height: 24px; - font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; color: #555; } + a { color: #555; text-decoration: underline; @@ -91,8 +91,7 @@ /** RTL **/ .rtl { - direction: rtl; - font-family: Tahoma, 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; + direction: rtl } .rtl table { @@ -105,7 +104,7 @@ - +
{% if bounty.network != 'mainnet' %}
diff --git a/app/dashboard/templates/bounty/kill.html b/app/dashboard/templates/bounty/kill.html index e53dea42ebf..65129606557 100644 --- a/app/dashboard/templates/bounty/kill.html +++ b/app/dashboard/templates/bounty/kill.html @@ -22,7 +22,7 @@ {% include 'shared/head.html' %} {% include 'shared/cards_pic.html' %} - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/bounty/new.html b/app/dashboard/templates/bounty/new.html index d0fbc3fdd53..f9714ca4248 100644 --- a/app/dashboard/templates/bounty/new.html +++ b/app/dashboard/templates/bounty/new.html @@ -24,7 +24,7 @@ - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/bulk_payout_bounty.html b/app/dashboard/templates/bulk_payout_bounty.html index 924235f2be7..f1c279a454a 100644 --- a/app/dashboard/templates/bulk_payout_bounty.html +++ b/app/dashboard/templates/bulk_payout_bounty.html @@ -22,7 +22,7 @@ {% include 'shared/cards.html' %} - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/contribute_bounty.html b/app/dashboard/templates/contribute_bounty.html index 6c082aeb3d1..a3acc9e24af 100644 --- a/app/dashboard/templates/contribute_bounty.html +++ b/app/dashboard/templates/contribute_bounty.html @@ -23,7 +23,7 @@ {% include 'shared/cards.html' %} - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html index 3c649fc6e91..c1f80f2f340 100644 --- a/app/dashboard/templates/dashboard/index.html +++ b/app/dashboard/templates/dashboard/index.html @@ -26,7 +26,7 @@ - + {% include 'shared/tag_manager_2.html' %}
{% include 'shared/nav.html' %} diff --git a/app/dashboard/templates/ens/base.html b/app/dashboard/templates/ens/base.html index e710638fd11..52d40bcacbe 100644 --- a/app/dashboard/templates/ens/base.html +++ b/app/dashboard/templates/ens/base.html @@ -9,6 +9,7 @@ + @@ -35,7 +36,7 @@ } - + {% block 'world' %} {% endblock %} {% include 'shared/rain.html' with class="color" %} @@ -47,7 +48,6 @@ {% block 'main' %} {% endblock %} -