Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
ba6cf483
Commit
ba6cf483
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge pull request #17069 from kkirsche/patch-9
Card variables should be in _variables.scss
parents
6524e53d
9e8bd818
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_card.scss
+0
-9
scss/_card.scss
scss/_variables.scss
+10
-0
scss/_variables.scss
with
10 additions
and
9 deletions
+10
-9
scss/_card.scss
+
0
-
9
View file @
ba6cf483
...
@@ -2,15 +2,6 @@
...
@@ -2,15 +2,6 @@
// Base styles
// Base styles
//
//
$card-spacer-x
:
1
.25rem
;
$card-spacer-y
:
.75rem
;
$card-border-width
:
.0625rem
;
$card-border-radius
:
.25rem
;
$card-border-color
:
#e5e5e5
;
$card-border-radius-inner
:
(
$card-border-radius
-
$card-border-width
);
$card-cap-bg
:
#f5f5f5
;
.card
{
.card
{
position
:
relative
;
position
:
relative
;
margin-bottom
:
$card-spacer-y
;
margin-bottom
:
$card-spacer-y
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
10
-
0
View file @
ba6cf483
...
@@ -444,6 +444,16 @@ $state-danger-bg: #f2dede !default;
...
@@ -444,6 +444,16 @@ $state-danger-bg: #f2dede !default;
$state-danger-border
:
darken
(
$state-danger-bg
,
5%
)
!
default
;
$state-danger-border
:
darken
(
$state-danger-bg
,
5%
)
!
default
;
// Cards
$card-spacer-x
:
1
.25rem
;
$card-spacer-y
:
.75rem
;
$card-border-width
:
.0625rem
;
$card-border-radius
:
.25rem
;
$card-border-color
:
#e5e5e5
;
$card-border-radius-inner
:
(
$card-border-radius
-
$card-border-width
);
$card-cap-bg
:
#f5f5f5
;
// Tooltips
// Tooltips
$tooltip-max-width
:
200px
!
default
;
$tooltip-max-width
:
200px
!
default
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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