Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
28b0ed33
Commit
28b0ed33
authored
Apr 10, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] polyfill .hidden selector
parent
9bcf8f43
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+16
-0
app/assets/stylesheets/framework.bs4.scss
app/assets/stylesheets/framework.bs4.scss
+0
-5
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-2
No files found.
app/assets/stylesheets/
framework.bs3
.scss
→
app/assets/stylesheets/
bootstrap_migration
.scss
View file @
28b0ed33
/*
* Scss to help with bootstrap 3 to 4 migration
*/
$text-color
:
$gl-text-color
;
$text-color
:
$gl-text-color
;
$brand-primary
:
$gl-primary
;
$brand-primary
:
$gl-primary
;
...
@@ -14,3 +18,15 @@ $input-border-focus: $focus-border-color;
...
@@ -14,3 +18,15 @@ $input-border-focus: $focus-border-color;
$padding-base-vertical
:
$gl-vert-padding
;
$padding-base-vertical
:
$gl-vert-padding
;
$padding-base-horizontal
:
$gl-padding
;
$padding-base-horizontal
:
$gl-padding
;
html
{
// Override default font size used in bs4
font-size
:
14px
;
}
// Polyfill deprecated selectors
.hidden
{
@extend
.d-none
;
@extend
.invisible
;
}
app/assets/stylesheets/framework.bs4.scss
deleted
100644 → 0
View file @
9bcf8f43
// Override variables from bs4
html
{
font-size
:
14px
;
}
app/assets/stylesheets/framework.scss
View file @
28b0ed33
@import
"framework/variables"
;
@import
"framework/variables"
;
@import
"framework/mixins"
;
@import
"framework/mixins"
;
@import
"framework.bs4"
;
@import
"../../../node_modules/bootstrap/scss/bootstrap"
;
@import
"../../../node_modules/bootstrap/scss/bootstrap"
;
@import
"
framework.bs3
"
;
@import
"
bootstrap_migration
"
;
@import
"framework/layout"
;
@import
"framework/layout"
;
@import
"framework/animations"
;
@import
"framework/animations"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment