-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #991 - Bootstrap 4
Sprockets and Bootstrap 4 Rebase of #927
- Loading branch information
Showing
54 changed files
with
575 additions
and
371 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
|
||
.breadcrumb-item + .breadcrumb-item::before { | ||
display: inline-block; | ||
margin: 0.25em 1em 0 0; | ||
transform: rotate(25deg); | ||
border-right: 0.1em solid currentColor; | ||
padding-right: 0.5em; | ||
height: 0.8em; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
// Bootstrap custom CSS | ||
|
||
table.dataTable > thead .sorting:before, table.dataTable > thead .sorting_asc:before, table.dataTable > thead .sorting_desc:before, table.dataTable > thead .sorting_asc_disabled:before, table.dataTable > thead .sorting_desc_disabled:before { | ||
right: 1.25em !important; | ||
} | ||
|
||
.card { | ||
a { | ||
text-decoration: none !important; | ||
} | ||
} | ||
|
||
.card-header h3 { | ||
font-size: 16px; | ||
font-weight: bold; | ||
} | ||
|
||
// Shim for buttons that still use old Bootstrap 3 default button class. | ||
.btn-default { | ||
color: #393939; | ||
background-color: #f8f8f8; | ||
border-color: #cbcbcb; | ||
} | ||
|
||
.btn-default:hover { | ||
background-color: darken(#f8f8f8, 10%); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
// Place all Bootstrap 4 variable overrides in this file. | ||
// Bootstrap 4 SASS variables list: https://github.com/twbs/bootstrap/blob/v4.6.0/scss/_variables.scss | ||
|
||
// Miscellaneous | ||
$enable-responsive-font-sizes: "true"; | ||
$enable-shadows: "true"; | ||
|
||
// Colors | ||
$green: #639e0f; | ||
|
||
$body-color: #111827; | ||
|
||
$primary: #337ab7; | ||
$danger: #d9534f; | ||
$info: #5bc0de; | ||
|
||
$navbar-light-color: rgb(119, 119, 119); | ||
$navbar-light-disabled-color: rgb(119, 119, 119); | ||
$navbar-dark-brand-color: rgb(119, 119, 119); | ||
|
||
$navbar-dark-color: #fff; | ||
$navbar-dark-active-color: rgba(#fff, .75); | ||
$navbar-dark-brand-color: #fff; | ||
$navbar-dark-disabled-color: rgba(#fff, .75); | ||
|
||
// Grid layout | ||
$container-max-widths: ( | ||
xs: 0, | ||
sm: 768px, | ||
md: 920px, | ||
lg: 1140px, | ||
xl: 1260px, | ||
); | ||
|
||
$grid-breakpoints: ( | ||
xs: 0, | ||
sm: 676px, | ||
md: 850px, | ||
lg: 1460px, | ||
xl: 1500px | ||
); | ||
|
||
// Navigation bar link gutter spacing x-axis. | ||
$navbar-nav-link-padding-x: 0.75rem; | ||
|
||
// breadcrumbs are purely visual for accessibility | ||
$breadcrumb-divider: ''; |
81 changes: 81 additions & 0 deletions
81
apps/dashboard/app/assets/stylesheets/app_kit/_markdown.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
.ood-appkit.markdown { | ||
font-size: 16px; | ||
line-height: 1.6; | ||
|
||
h1 { | ||
margin-right: 150px; | ||
font-size: 30px; | ||
font-weight: normal; | ||
line-height: 1.1; | ||
} | ||
|
||
h2 { | ||
padding-bottom: 0.3em; | ||
margin-top: 1em; | ||
margin-bottom: 16px; | ||
font-size: 1.75em; | ||
font-weight: bold; | ||
line-height: 1.225; | ||
} | ||
|
||
h3 { | ||
margin-top: 1em; | ||
margin-bottom: 16px; | ||
font-size: 1.5em; | ||
font-weight: bold; | ||
line-height: 1.43; | ||
} | ||
|
||
h4 { | ||
margin-top: 1em; | ||
margin-bottom: 16px; | ||
font-size: 1.25em; | ||
font-weight: bold; | ||
line-height: 1.4; | ||
} | ||
|
||
img { | ||
border: 0; | ||
max-width: 100%; | ||
} | ||
|
||
p { | ||
margin-top: 0; | ||
margin-bottom: 16px; | ||
} | ||
|
||
li>p { | ||
margin-top: 16px; | ||
} | ||
|
||
table { | ||
display: block; | ||
width: 100%; | ||
overflow: auto; | ||
word-break: keep-all; | ||
|
||
// .markdown p, .markdown table, ... | ||
margin-top: 0; | ||
margin-bottom: 16px; | ||
|
||
tr { | ||
border-top: 1px solid #ccc; | ||
} | ||
|
||
tr:nth-child(2n) td { | ||
background-color: #f8f8f8; | ||
} | ||
|
||
th, | ||
td { | ||
padding: 6px 13px; | ||
border: 1px solid #ddd; | ||
} | ||
} | ||
|
||
pre { | ||
code { | ||
white-space: pre; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.