Removing and restructuring custom CSS for bootstrap - refs #2681

pull/2715/head
Alex Aragón 7 years ago
parent f9c9db2984
commit 8494746531
  1. 2
      assets/css/bootstrap.scss
  2. 50
      assets/css/scss/_base.scss
  3. 0
      assets/css/scss/_loader.scss
  4. 27
      assets/css/scss/_media.scss
  5. 21
      assets/css/scss/_sidebar.scss
  6. 12
      assets/css/scss/_topbar.scss
  7. 31
      assets/css/scss/_variables.scss
  8. 8
      assets/css/scss/components/footer.scss
  9. 4
      assets/css/scss/components/index.scss
  10. 10
      assets/css/scss/index.scss
  11. 1
      assets/css/scss/screens/index.scss
  12. 26
      assets/css/scss/settings/breakpoints.scss
  13. 7
      assets/css/scss/settings/fonts.scss
  14. 3
      assets/css/scss/settings/index.scss
  15. 194
      assets/css/scss/utils/border.scss
  16. 3
      assets/css/scss/utils/index.scss
  17. 69
      assets/css/scss/utils/mediaqueriesranges.scss
  18. 95
      assets/css/scss/utils/typography.scss
  19. 2
      webpack.config.js

@ -1,2 +0,0 @@
@import "~bootstrap/scss/bootstrap";
@import "~@fortawesome/fontawesome-free/css/all.css";

@ -196,4 +196,54 @@ hr {
}
}
// ---------------------------------------------------------
// FOOTER
// ---------------------------------------------------------
footer {
z-index: 1;
position: relative;
}
// ---------------------------------------------------------
// @Text Align
// ---------------------------------------------------------
.ta-c { text-align: center !important; }
.ta-l { text-align: left !important; }
.ta-r { text-align: right !important; }
// ---------------------------------------------------------
// @Font Size
// ---------------------------------------------------------
.fsz-xs { font-size: 0.75rem !important; }
.fsz-sm { font-size: 0.87rem !important; }
.fsz-def { font-size: 1rem !important; }
.fsz-md { font-size: 1.15rem !important; }
.fsz-lg { font-size: 1.4rem !important; }
.fsz-xl { font-size: 1.7rem !important; }
// ---------------------------------------------------------
// @Font Weight
// ---------------------------------------------------------
.fw-100 { font-weight: 100 !important; }
.fw-200 { font-weight: 200 !important; }
.fw-300 { font-weight: 300 !important; }
.fw-400 { font-weight: 400 !important; }
.fw-500 { font-weight: 500 !important; }
.fw-600 { font-weight: 600 !important; }
.fw-700 { font-weight: 700 !important; }
.fw-800 { font-weight: 800 !important; }
.fw-900 { font-weight: 900 !important; }
// ---------------------------------------------------------
// @Line Height
// ---------------------------------------------------------
.lh-0 { line-height: 0 !important; }
.lh-1 { line-height: 1 !important; }
.lh-3\/2 { line-height: 1.5 !important; }

@ -0,0 +1,27 @@
// ---------------------------------------------------------
// MEDIA QUERIES
// ---------------------------------------------------------
@mixin mq($condition) {
@media #{$condition} {
@content;
}
}
@mixin from($breakpoint) {
@media screen and (min-width: $breakpoint){
@content;
}
}
@mixin to($breakpoint) {
@media screen and (max-width: $breakpoint - 1px) {
@content;
}
}
@mixin between($start, $end){
@media screen and (min-width: $start) and (max-width: $end - 1px) {
@content;
}
}

@ -126,12 +126,10 @@
width: 100%;
.logo {
background-position: center left;
background-repeat: no-repeat;
background: no-repeat center left;
display: inline-block;
min-height: calc(#{$header-height} - 1px);
width: 100%;
width: 70px;
}
.logo-text {
@ -174,7 +172,7 @@
position: relative;
background: linear-gradient(180deg, #0181bf, #00bcda);
.nav-header{
.nav-header {
margin-top: 10px;
margin-bottom: 10px;
padding-left: 10px;
@ -183,11 +181,11 @@
color: $default-white;
}
.sidebar-divider{
.sidebar-divider {
height: 0;
margin: .5rem 0;
overflow: hidden;
border-top: 1px solid #217aa4;
border-top: 1px solid #217aa4;
border-bottom: 1px solid #16b1fd;
}
@ -228,7 +226,7 @@
> a {
color: $default-white;
&.dropdown-toggle{
&.dropdown-toggle {
background: $default-active;
}
@ -265,7 +263,7 @@
position: relative;
white-space: nowrap;
i{
i {
border-radius: 6px;
display: inline-block;
font-size: 17px;
@ -279,7 +277,7 @@
width: 35px;
}
&.active{
&.active {
background: $default-active;
}
@ -353,7 +351,7 @@
overflow-x: hidden;
> li {
&.nav-header{
&.nav-header {
display: none;
}
@ -383,7 +381,6 @@
&:hover {
width: $offscreen-size;
.sidebar-inner {
.sidebar-logo {
border-bottom: 1px solid $border-color;
@ -392,7 +389,7 @@
.sidebar-menu {
> li {
&.nav-header{
&.nav-header {
display: inline-block;
}
> a {

@ -12,7 +12,7 @@
transition: all 0.2s ease;
width: calc(100% - #{$offscreen-size});
z-index: 800;
box-shadow: 0px 8px 20px -10px rgba(0,0,0,0.15);
box-shadow: 0px 8px 20px -10px rgba(0, 0, 0, 0.15);
@include to($breakpoint-md) {
width: 100%;
@ -27,7 +27,7 @@
height: $header-height;
.btn-menu{
.btn-menu {
padding-left: 10px;
padding-right: 0;
}
@ -42,7 +42,7 @@
> li {
float: left;
&.btn-padding{
&.btn-padding {
padding-top: 15px;
padding-bottom: 15px;
margin-left: 5px;
@ -57,7 +57,7 @@
padding: 0 15px;
transition: all 0.2s ease-in-out;
&.btn{
&.btn {
min-height: 30px;
padding: 0 10px;
line-height: 30px;
@ -193,10 +193,6 @@
width: 85px;
}
@include placeholder {
color: lighten($default-text-color, 20%);
font-style: italic;
}
}
}
}

@ -1,3 +1,13 @@
// ---------------------------------------------------------
// BREAKPOINTS
// ---------------------------------------------------------
$breakpoint-xl : 1440px;
$breakpoint-lg : 1200px;
$breakpoint-md : 992px;
$breakpoint-sm : 768px;
$breakpoint-xs : 0;
// ---------------------------------------------------------
// GREYSCALE COLORS
// ---------------------------------------------------------
@ -12,17 +22,6 @@ $grey-700 : #72777a;
$grey-800 : #565a5c;
$grey-900 : #313435;
$grey-colors-alt: (
grey-100 : #f9fafb,
grey-200 : #f2f3f5,
grey-300 : #e6eaf0,
grey-400 : #d3d9e3,
grey-500 : #b9c2d0,
grey-600 : #7c8695,
grey-700 : #72777a,
grey-800 : #565a5c,
grey-900 : #313435,
);
// ---------------------------------------------------------
// COLORS THEME DEFAULT
@ -53,7 +52,7 @@ $inverse-warning : lighten($default-warning, 45%);
// OTHERS
// ---------------------------------------------------------
$border-color : #e6ecf5;
$collapsed-size : 70px;
$header-height : 65px;
$offscreen-size : 280px;
@ -71,3 +70,11 @@ $theme-info : $default-info;
$theme-primary : $default-primary;
$theme-success : desaturate($default-success, 5%);
$theme-bg : #FFFFFF;
// ---------------------------------------------------------
// FONTS
// ---------------------------------------------------------
$font-primary: Roboto, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
$font-secondary: $font-primary;
$font-size-base: 0.875rem;

@ -1,8 +0,0 @@
// ---------------------------------------------------------
// FOOTER
// ---------------------------------------------------------
footer {
z-index: 1;
position: relative;
}

@ -1,4 +0,0 @@
@import 'footer';
@import 'topbar';
@import 'loader';
@import 'sidebar';

@ -1,4 +1,6 @@
@import "utils/index";
@import 'settings/index';
@import 'screens/index';
@import 'components/index';
@import 'variables';
@import "media";
@import 'loader';
@import 'base';
@import 'topbar';
@import 'sidebar';

@ -1,26 +0,0 @@
// ---------------------------------------------------------
// BREAKPOINTS
// ---------------------------------------------------------
$breakpoint-xl : 1440px;
$breakpoint-lg : 1200px;
$breakpoint-md : 992px;
$breakpoint-sm : 768px;
$breakpoint-xs : 0;
$breakpoints: (
"xl\\+" "screen and (min-width: #{$breakpoint-xl})",
"lg\\+" "screen and (min-width: #{$breakpoint-lg})",
"md\\+" "screen and (min-width: #{$breakpoint-md})",
"sm\\+" "screen and (min-width: #{$breakpoint-sm})",
"xs\\+" "screen and (min-width: #{$breakpoint-xs})",
"xl-" "screen and (max-width: #{$breakpoint-xl - 1px})",
"lg-" "screen and (max-width: #{$breakpoint-lg - 1px})",
"md-" "screen and (max-width: #{$breakpoint-md - 1px})",
"sm-" "screen and (max-width: #{$breakpoint-sm - 1px})",
"lg" "screen and (min-width: #{$breakpoint-lg - 1px}) and (max-width: #{$breakpoint-xl - 1px})",
"md" "screen and (min-width: #{$breakpoint-md - 1px}) and (max-width: #{$breakpoint-lg - 1px})",
"sm" "screen and (min-width: #{$breakpoint-sm - 1px}) and (max-width: #{$breakpoint-md - 1px})",
);

@ -1,7 +0,0 @@
// ---------------------------------------------------------
// FONTS
// ---------------------------------------------------------
$font-primary: Roboto, -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
$font-secondary: $font-primary;
$font-size-base: 0.875rem;

@ -1,3 +0,0 @@
@import 'breakpoints';
@import 'colors';
@import 'fonts';

@ -1,194 +0,0 @@
// ---------------------------------------------------------
// @Fixed Width
// ---------------------------------------------------------
.w-1\/4r, .sz-1\/4r { width: 0.25rem; }
.w-1\/2r, .sz-1\/2r { width: 0.5rem; }
.w-3\/4r, .sz-3\/4r { width: 0.75rem; }
.w-1r, .sz-1r { width: 1rem; }
.w-3\/2r, .sz-3\/2r { width: 1.5rem; }
.w-2r, .sz-2r { width: 2rem; }
.w-5\/2r, .sz-5\/2r { width: 2.5rem; }
.w-3r, .sz-3r { width: 3rem; }
.w-7\/2r, .sz-7\/2r { width: 3.5rem; }
.w-4r, .sz-4r { width: 4rem; }
.w-9\/2r, .sz-9\/2r { width: 4.5rem; }
.w-5r, .sz-5r { width: 5rem; }
.w-11\/2r, .sz-11\/2r { width: 5.5rem; }
.w-6r, .sz-6r { width: 6rem; }
// ---------------------------------------------------------
// @Relative Width
// ---------------------------------------------------------
.w-0 { width: 0px; }
.w-10p { width: 10%; }
.w-20p { width: 20%; }
.w-30p { width: 30%; }
.w-40p { width: 40%; }
.w-50p { width: 50%; }
.w-60p { width: 60%; }
.w-70p { width: 70%; }
.w-80p { width: 80%; }
.w-90p { width: 90%; }
.w-100p { width: 100%; }
.w-1px { width: 1px; }
.w-a { width: auto; }
// ---------------------------------------------------------
// @Fixed Height
// ---------------------------------------------------------
.h-1\/4r, .sz-1\/4r { height: 0.25rem; }
.h-1\/2r, .sz-1\/2r { height: 0.5rem; }
.h-3\/4r, .sz-3\/4r { height: 0.75rem; }
.h-1r, .sz-1r { height: 1rem; }
.h-3\/2r, .sz-3\/2r { height: 1.5rem; }
.h-2r, .sz-2r { height: 2rem; }
.h-5\/2r, .sz-5\/2r { height: 2.5rem; }
.h-3r, .sz-3r { height: 3rem; }
.h-7\/2r, .sz-7\/2r { height: 3.5rem; }
.h-4r, .sz-4r { height: 4rem; }
.h-9\/2r, .sz-9\/2r { height: 4.5rem; }
.h-5r, .sz-5r { height: 5rem; }
.h-11\/2r, .sz-11\/2r { height: 5.5rem; }
.h-6r, .sz-6r { height: 6rem; }
.h-0 { height: 0; }
.h-auto { height: auto; }
.h-100p { height: 100%; }
.h-100vh { height: 100vh; }
// ---------------------------------------------------------
// @Max Size
// ---------------------------------------------------------
.mw-100p { max-width: 100%; }
.mh-100p { max-height: 100%; }
// ---------------------------------------------------------
// @Quick Border Helpers
// ---------------------------------------------------------
.bd { border: #{$border-width} solid #{$border-color} !important; }
.bdT { border-top: #{$border-width} solid #{$border-color} !important; }
.bdR { border-right: #{$border-width} solid #{$border-color} !important; }
.bdB { border-bottom: #{$border-width} solid #{$border-color} !important; }
.bdL { border-left: #{$border-width} solid #{$border-color} !important; }
// ---------------------------------------------------------
// @Border Width
// ---------------------------------------------------------
@for $i from 0 through 5 {
.bdw-#{$i} { border-width: #{$i}px !important; }
.bdwT-#{$i} { border-top-width: #{$i}px !important; }
.bdwR-#{$i} { border-right-width: #{$i}px !important; }
.bdwB-#{$i} { border-bottom-width: #{$i}px !important; }
.bdwL-#{$i} { border-left-width: #{$i}px !important; }
}
// ---------------------------------------------------------
// @Border Radius
// ---------------------------------------------------------
@for $i from 0 to 5 {
.bdrs-#{$i} { border-radius: #{$i}px !important; }
.bdrsT-#{$i} {
border-top-left-radius: #{$i}px !important;
border-top-right-radius: #{$i}px !important;
}
.bdrsR-#{$i} {
border-top-right-radius: #{$i}px !important;
border-bottom-right-radius: #{$i}px !important;
}
.bdrsB-#{$i} {
border-bottom-left-radius: #{$i}px !important;
border-bottom-right-radius: #{$i}px !important;
}
.bdrsL-#{$i} {
border-top-left-radius: #{$i}px !important;
border-bottom-left-radius: #{$i}px !important;
}
}
.bdrs-50p { border-radius: 50% !important; }
.bdrs-10em { border-radius: 10em !important; }
// ---------------------------------------------------------
// @Border Style
// ---------------------------------------------------------
.bds-n { border-style: none !important; }
.bds-s { border-style: solid !important; }
.bds-dt { border-style: dotted !important; }
.bds-ds { border-style: dashed !important; }
.bds-db { border-style: double !important; }
.bds-g { border-style: groove !important; }
.bds-r { border-style: ridge !important; }
.bds-i { border-style: inset !important; }
.bds-o { border-style: outset !important; }
.peers {
box-sizing: border-box;
display: flex !important;
align-items: flex-start;
justify-content: flex-start;
flex-flow: row wrap;
height: auto;
max-width: 100%;
margin: 0;
padding: 0;
}
.peer {
display: block;
height: auto;
flex: 0 0 auto;
}
.peer-greed {
flex: 1 1 auto;
// overflow: hidden;
}
.peers-greed > .peer,
.peers-greed > .peers {
flex: 1 1 auto;
}
.peer > img {
max-width: none;
}
.peer-greed > img {
max-width: 100%;
}
// ---------------------------------------------------------
// @Align Items
// ---------------------------------------------------------
.ai-fs { align-items: flex-start; }
.ai-fe { align-items: flex-end; }
.ai-c { align-items: center; }
.ai-b { align-items: baseline; }
.ai-s { align-items: stretch; }
// ---------------------------------------------------------
// @Pseudo Elements
// ---------------------------------------------------------
.no-after::after { display: none !important; }
.no-before::before { display: none !important; }

@ -1,3 +0,0 @@
@import "mediaqueriesranges";
@import "border";
@import "typography";

@ -1,69 +0,0 @@
// ---------------------------------------------------------
// @TOC
// ---------------------------------------------------------
// + @General Media Query
// + @All Above Media Query
// + @All Under Media Query
// + @Between Two Devices Media Query
// ---------------------------------------------------------
// @General Media Query Mixin
// ---------------------------------------------------------
// Mixin used for custom rules that don't follow
// any of the following premade media queries.
@mixin mq($condition) {
@media #{$condition} {
@content;
}
}
// ---------------------------------------------------------
// @All Above Media Query Mixin
// ---------------------------------------------------------
// Mixin used to match certain breakpoint
// and all devices above it.
@mixin from($breakpoint) {
@media screen and (min-width: $breakpoint){
@content;
}
}
// ---------------------------------------------------------
// @All Under Media Query Mixin
// ---------------------------------------------------------
// Mixin used to match all devices under certain breakpoint.
@mixin to($breakpoint) {
@media screen and (max-width: $breakpoint - 1px) {
@content;
}
}
// ---------------------------------------------------------
// @Between Two Devices Media Query Mixin
// ---------------------------------------------------------
// Mixin used to match the devices between 2 breakpoints.
@mixin between($start, $end){
@media screen and (min-width: $start) and (max-width: $end - 1px) {
@content;
}
}
//----------------------------------------------------------
// @Placeholder
//----------------------------------------------------------
@mixin placeholder {
&::-webkit-input-placeholder { @content; }
&:-moz-placeholder { @content; }
&::-moz-placeholder { @content; }
&:-ms-input-placeholder { @content; }
}

@ -1,95 +0,0 @@
// ---------------------------------------------------------
// @Text Align
// ---------------------------------------------------------
.ta-c { text-align: center !important; }
.ta-l { text-align: left !important; }
.ta-r { text-align: right !important; }
// ---------------------------------------------------------
// @Text Transform
// ---------------------------------------------------------
.tt-n { text-transform: none !important; }
.tt-u { text-transform: uppercase !important; }
.tt-l { text-transform: lowercase !important; }
.tt-c { text-transform: capitalize !important; }
// ---------------------------------------------------------
// @Font Style
// ---------------------------------------------------------
.fs-i { font-style: italic !important; }
.fs-o { font-style: oblique !important; }
// ---------------------------------------------------------
// @Text Decoration
// ---------------------------------------------------------
.td-n { text-decoration: none !important; }
.td-o { text-decoration: overline !important; }
.td-lt { text-decoration: line-through !important; }
.td-u { text-decoration: underline !important; }
// ---------------------------------------------------------
// @White Space
// ---------------------------------------------------------
.whs-nw { white-space: nowrap !important; }
.whs-p { white-space: pre !important; }
.whs-n { white-space: normal !important; }
// ---------------------------------------------------------
// @Word Break
// ---------------------------------------------------------
.wob-n { word-break: normal !important; }
.wob-ba { word-break: break-all !important; }
.wob-k { word-break: keep-all !important; }
// ---------------------------------------------------------
// @Word Wrap
// ---------------------------------------------------------
.wow-bw { word-wrap: break-word !important; }
.wow-n { word-wrap: normal !important; }
// ---------------------------------------------------------
// @Text Overflow
// ---------------------------------------------------------
.tov-e { text-overflow: ellipsis !important; }
// ---------------------------------------------------------
// @Font Size
// ---------------------------------------------------------
.fsz-xs { font-size: 0.75rem !important; }
.fsz-sm { font-size: 0.87rem !important; }
.fsz-def { font-size: 1rem !important; }
.fsz-md { font-size: 1.15rem !important; }
.fsz-lg { font-size: 1.4rem !important; }
.fsz-xl { font-size: 1.7rem !important; }
// ---------------------------------------------------------
// @Font Weight
// ---------------------------------------------------------
.fw-100 { font-weight: 100 !important; }
.fw-200 { font-weight: 200 !important; }
.fw-300 { font-weight: 300 !important; }
.fw-400 { font-weight: 400 !important; }
.fw-500 { font-weight: 500 !important; }
.fw-600 { font-weight: 600 !important; }
.fw-700 { font-weight: 700 !important; }
.fw-800 { font-weight: 800 !important; }
.fw-900 { font-weight: 900 !important; }
// ---------------------------------------------------------
// @Line Height
// ---------------------------------------------------------
.lh-0 { line-height: 0 !important; }
.lh-1 { line-height: 1 !important; }
.lh-3\/2 { line-height: 1.5 !important; }

@ -23,7 +23,7 @@ Encore
.addEntry('bootstrap', './assets/js/bootstrap.js')
// Reads app.scss -> output as web/build/css/base.css
.addStyleEntry('css/app', './assets/css/app.scss')
.addStyleEntry('css/bootstrap', './assets/css/bootstrap.scss')
//.addStyleEntry('css/bootstrap', './assets/css/bootstrap.scss')
.addStyleEntry('css/chat', './assets/css/chat.css')
.addStyleEntry('css/document', './assets/css/document.css')

Loading…
Cancel
Save