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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
f603eebd
Commit
f603eebd
authored
Nov 28, 2018
by
Lukas Eipert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to bootstrap 4.1.3
parent
385e8f71
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
6 deletions
+15
-6
app/assets/stylesheets/bootstrap.scss
app/assets/stylesheets/bootstrap.scss
+1
-1
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+9
-0
package.json
package.json
+1
-1
yarn.lock
yarn.lock
+4
-4
No files found.
app/assets/stylesheets/bootstrap.scss
View file @
f603eebd
/*
* Includes specific styles from the bootstrap4 foler in node_modules
* Includes specific styles from the bootstrap4 fol
d
er in node_modules
*/
@import
"../../../node_modules/bootstrap/scss/functions"
;
...
...
app/assets/stylesheets/bootstrap_migration.scss
View file @
f603eebd
...
...
@@ -336,3 +336,12 @@ input[type=color].form-control {
.input-group-btn
:last-child
{
@extend
.input-group-append
;
}
/*
Bootstrap 4.1.2 introduced a new default vertical alignment which breaks our icons,
so we need to reset the vertical alignment to the default value. See:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/51362
*/
svg
{
vertical-align
:
baseline
;
}
package.json
View file @
f603eebd
...
...
@@ -31,7 +31,7 @@
"
autosize
"
:
"
^4.0.0
"
,
"
axios
"
:
"
^0.17.1
"
,
"
babel-loader
"
:
"
^8.0.4
"
,
"
bootstrap
"
:
"
4.1.
1
"
,
"
bootstrap
"
:
"
4.1.
3
"
,
"
brace-expansion
"
:
"
^1.1.8
"
,
"
cache-loader
"
:
"
^1.2.2
"
,
"
chart.js
"
:
"
1.0.2
"
,
...
...
yarn.lock
View file @
f603eebd
...
...
@@ -1505,10 +1505,10 @@ bootstrap-vue@^2.0.0-rc.11:
popper.js "^1.12.9"
vue-functional-data-merge "^2.0.5"
bootstrap@4.1.
1
, bootstrap@^4.1.1:
version "4.1.
1
"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.
1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb
"
integrity sha512-
SpiDSOcbg4J/PjVSt4ny5eY6j74VbVSjROY4Fb/WIUXBV9cnb5luyR4KnPvNoXuGnBK1T+nJIWqRsvU3yP8Mcg
==
bootstrap@4.1.
3
, bootstrap@^4.1.1:
version "4.1.
3
"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.
3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be
"
integrity sha512-
rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w
==
boxen@^1.2.1:
version "1.3.0"
...
...
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