diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-09 09:22:10 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-09 09:22:10 +0200 |
commit | b34a444e291c8ec90b4c2c965f7d0d6904d1faa7 (patch) | |
tree | 9880b79b12882b0cebf7b51ab6d5eb3efe62c585 /client/src/sass/application.scss | |
parent | eacb25c4366bcc8fba20f98f93f004fabc6d5578 (diff) | |
download | PeerTube-b34a444e291c8ec90b4c2c965f7d0d6904d1faa7.tar.gz PeerTube-b34a444e291c8ec90b4c2c965f7d0d6904d1faa7.tar.zst PeerTube-b34a444e291c8ec90b4c2c965f7d0d6904d1faa7.zip |
Upgrade to bootstrap 4 first step
Diffstat (limited to 'client/src/sass/application.scss')
-rw-r--r-- | client/src/sass/application.scss | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 65711a225..74759348e 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -1,7 +1,7 @@ | |||
1 | @import '_variables'; | 1 | @import '_variables'; |
2 | @import '_mixins'; | 2 | @import '_mixins'; |
3 | 3 | ||
4 | $icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/'; | 4 | $icon-font-path: '../../node_modules/@neos21/bootstrap3-glyphicons/assets/fonts/'; |
5 | @import '_bootstrap'; | 5 | @import '_bootstrap'; |
6 | 6 | ||
7 | @import '_fonts'; | 7 | @import '_fonts'; |
@@ -22,6 +22,7 @@ body { | |||
22 | font-family: $main-fonts; | 22 | font-family: $main-fonts; |
23 | font-weight: $font-regular; | 23 | font-weight: $font-regular; |
24 | color: #000; | 24 | color: #000; |
25 | font-size: 14px; | ||
25 | } | 26 | } |
26 | 27 | ||
27 | #incompatible-browser { | 28 | #incompatible-browser { |
@@ -62,10 +63,12 @@ label { | |||
62 | 63 | ||
63 | .main-col { | 64 | .main-col { |
64 | margin-left: $menu-width; | 65 | margin-left: $menu-width; |
66 | width: auto; | ||
65 | 67 | ||
66 | .margin-content { | 68 | .margin-content { |
67 | margin-left: $not-expanded-horizontal-margins; | 69 | margin-left: $not-expanded-horizontal-margins; |
68 | margin-right: $not-expanded-horizontal-margins; | 70 | margin-right: $not-expanded-horizontal-margins; |
71 | flex-grow: 1; | ||
69 | } | 72 | } |
70 | 73 | ||
71 | .sub-menu { | 74 | .sub-menu { |