diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /client/src/sass/include/_bootstrap-variables.scss | |
parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'client/src/sass/include/_bootstrap-variables.scss')
-rw-r--r-- | client/src/sass/include/_bootstrap-variables.scss | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss index ce2532af5..7f413836b 100644 --- a/client/src/sass/include/_bootstrap-variables.scss +++ b/client/src/sass/include/_bootstrap-variables.scss | |||
@@ -29,4 +29,7 @@ $input-btn-focus-color: inherit; | |||
29 | $input-focus-border-color: #ced4da; | 29 | $input-focus-border-color: #ced4da; |
30 | 30 | ||
31 | $nav-pills-link-active-bg: #F0F0F0; | 31 | $nav-pills-link-active-bg: #F0F0F0; |
32 | $nav-pills-link-active-color: #000; \ No newline at end of file | 32 | $nav-pills-link-active-color: #000; |
33 | |||
34 | $zindex-dropdown: 10000; | ||
35 | $zindex-popover: 10000; | ||