gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Bootstrap varible names for font-family

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2019-11-13 11:05:51 -03:00
parent b9380c58a2
commit f59cc3211f
11 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
themes/bootstrap/scss/_common.scss
View File

@ -1,5 +1,4 @@
body {
font-family: $font-family;
padding: 0;
margin: 0;
margin-#{$left}: $navi-width;
@ -19,7 +18,7 @@ textarea,
tt,
pre,
code {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
h2 {
@ -671,7 +670,7 @@ table {
}
.value {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
.attention {
@ -2356,7 +2355,7 @@ table#index_columns {
border: 0 #c83838 solid;
border-width: 1px 0;
list-style: none;
font-family: $font-family;
font-family: $font-family-base;
font-size: small;
}
@ -2396,7 +2395,7 @@ table#index_columns {
small {
display: block;
font-weight: normal;
font-family: $font-family;
font-family: $font-family-base;
font-size: x-small;
color: #444;
}

8
themes/bootstrap/scss/_variables.scss
View File

@ -38,14 +38,6 @@ $browse-marker-color: #000;
// background of the marker (visually marks row by clicking on it) in browse mode
$browse-marker-background: #fc9;
// fonts
// the font family as a valid css font family value, if not set the browser default will be
// used (depending on browser, DTD and system settings)
$font-family: sans-serif;
// fixed width font family, used in textarea
$font-family-fixed: monospace;
// tables
// border

4
themes/metro/scss/_codemirror.scss
View File

@ -4,7 +4,7 @@ $textarea-cols: 40 !default;
$textarea-rows: 15 !default;
.CodeMirror {
font-family: $font-family-fixed !important;
font-family: $font-family-monospace !important;
height: ceil($textarea-rows * 1.2em);
border: 1px solid #ccc;
direction: ltr;
@ -15,7 +15,7 @@ $textarea-rows: 15 !default;
}
.CodeMirror * {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
#inline_editor_outer .CodeMirror {

19
themes/metro/scss/_common.scss
View File

@ -83,7 +83,6 @@ textarea {
}
body {
font-family: $font-family;
padding: 0;
margin-#{$left}: $navi-width;
color: $main-color;
@ -197,7 +196,7 @@ body#loginform {
background: $navi-background;
color: $navi-color;
padding-#{$left}: 0 !important;
font-family: $font-family;
font-family: $font-family-base;
min-width: 100%;
&:hover {
@ -249,7 +248,7 @@ textarea,
tt,
pre,
code {
font-family: $font-family-fixed !important;
font-family: $font-family-monospace !important;
}
h1 {
@ -411,7 +410,7 @@ input {
color: $th-color;
padding: 5px;
margin: 6px;
font-family: $font-family;
font-family: $font-family-base;
background-color: $main-background;
&:focus {
@ -497,7 +496,7 @@ select {
border: 1px solid $browse-gray-color;
color: $th-color;
padding: 4px;
font-family: $font-family;
font-family: $font-family-base;
margin: 5px;
background-color: $main-background;
max-width: 17em;
@ -822,7 +821,7 @@ table {
}
.value {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
.attention {
@ -1275,14 +1274,14 @@ div#tablestatistics table {
overflow: hidden;
margin: 0;
margin-#{$left}: -1em;
font-family: $font-family;
font-family: $font-family-base;
color: $button-color;
background: $navi-background;
height: 15px;
box-sizing: content-box;
.item {
font-family: $font-family;
font-family: $font-family-base;
white-space: nowrap;
color: $button-color;
@ -1352,7 +1351,7 @@ div#tablestatistics table {
#textSQLDUMP {
width: 95%;
height: 95%;
font-family: $font-family-fixed;
font-family: $font-family-monospace;
font-size: 110%;
}
@ -4061,7 +4060,7 @@ body {
}
.ui-dialog-buttonpane button {
font-family: $font-family;
font-family: $font-family-base;
color: $button-color;
background-color: $navi-background;
background-image: none;

2
themes/metro/scss/_jqplot.scss
View File

@ -5,7 +5,7 @@
.jqplot-target {
position: relative;
color: #222;
font-family: $font-family;
font-family: $font-family-base;
font-size: 1em;
}

4
themes/metro/scss/_navigation.scss
View File

@ -12,7 +12,7 @@
input[type="text"] {
background-color: $main-background;
font-family: $font-family;
font-family: $font-family-base;
}
a {
@ -407,7 +407,7 @@ li.fast_filter {
background-color: #fff;
border: 1px solid #ccc;
color: #666;
font-family: $font-family;
font-family: $font-family-base;
padding: 2px;
}

25
themes/metro/scss/_variables.scss
View File

@ -1,11 +1,6 @@
// configures general layout for detailed layout configuration please refer to the css files
$navi-width: 250px;
$font-family: "Open Sans", "Segoe UI", sans-serif;
$font-family-light: "Open Sans Light", "Segoe UI Light", "Segoe UI", sans-serif;
$font-family-bold: "Open Sans Bold", sans-serif;
$font-family-extra-bold: "Open Sans Extrabold", "Segoe Black", sans-serif;
$font-family-fixed: Consolas, "Lucida Grande", monospace;
// Theme color scheme
// Values: "teal", "redmond", "blueeyes", "mono", "win"
@ -151,22 +146,38 @@ $blue-header: #3a7ead;
}
// Bootstrap
// ---------
// Typography
$font-family-base: "Open Sans", "Segoe UI", sans-serif;
$font-family-monospace: Consolas, "Lucida Grande", monospace;
$font-family-light: "Open Sans Light", "Segoe UI Light", "Segoe UI", sans-serif;
$font-family-bold: "Open Sans Bold", sans-serif;
$font-family-extra-bold: "Open Sans Extrabold", "Segoe Black", sans-serif;
$font-size-base: 0.8rem;
// Buttons
$enable-transitions: false;
$primary: $browse-pointer-color;
$secondary: $browse-gray-color;
$font-size-base: 0.8rem;
$btn-border-radius: 0;
$btn-line-height: 1;
$btn-padding-x: 0.5rem;
// Card
$card-border-width: 0;
$card-cap-color: $navi-background;
$card-cap-bg: $main-background;
// Alert
$alert-margin-bottom: 1em;
$alert-border-radius: 0;
$alert-border-width: 0;

7
themes/original/scss/_common.scss
View File

@ -11,7 +11,6 @@ textarea {
}
body {
font-family: $font-family;
padding: 0;
margin: 0;
margin-#{$left}: 240px;
@ -31,7 +30,7 @@ textarea,
tt,
pre,
code {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
h1 {
@ -390,7 +389,7 @@ table {
}
.value {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
.attention {
@ -984,7 +983,7 @@ div#tablestatistics table {
#textSQLDUMP {
width: 95%;
height: 95%;
font-family: $font-family-fixed;
font-family: $font-family-monospace;
font-size: 110%;
}

18
themes/original/scss/_variables.scss
View File

@ -38,14 +38,6 @@ $browse-marker-color: #000;
// background of the marker (visually marks row by clicking on it) in browse mode
$browse-marker-background: #fc9;
// fonts
// the font family as a valid css font family value, if not set the browser default will be
// used (depending on browser, DTD and system settings)
$font-family: sans-serif;
// fixed width font family, used in textarea
$font-family-fixed: monospace;
// tables
// border
@ -60,6 +52,14 @@ $bg-one: #e5e5e5;
$bg-two: #d5d5d5;
// Bootstrap
// ---------
// Typography
$font-family-base: sans-serif;
$font-family-monospace: monospace;
// Card
$card-border-radius: 0;
$card-border-width: 0.3em;
@ -67,6 +67,8 @@ $card-border-color: $th-background;
$card-cap-bg: $th-background;
$card-bg: none;
// Alert
$alert-margin-bottom: 0.2em;
$alert-border-radius: 0;
$alert-border-width: 2px;

9
themes/pmahomme/scss/_common.scss
View File

@ -14,7 +14,6 @@ textarea {
}
body {
font-family: $font-family;
padding: 0;
margin: 0;
margin-#{$left}: $navi-width;
@ -34,7 +33,7 @@ textarea,
tt,
pre,
code {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
h1 {
@ -691,7 +690,7 @@ table {
}
.value {
font-family: $font-family-fixed;
font-family: $font-family-monospace;
}
.attention {
@ -2382,7 +2381,7 @@ table#index_columns {
border: 0 #c83838 solid;
border-width: 1px 0;
list-style: none;
font-family: $font-family;
font-family: $font-family-base;
font-size: small;
}
@ -2422,7 +2421,7 @@ table#index_columns {
small {
display: block;
font-weight: normal;
font-family: $font-family;
font-family: $font-family-base;
font-size: x-small;
color: #444;
}

20
themes/pmahomme/scss/_variables.scss
View File

@ -38,14 +38,6 @@ $browse-marker-color: #000;
// background of the marker (visually marks row by clicking on it) in browse mode
$browse-marker-background: #fc9;
// fonts
// the font family as a valid css font family value, if not set the browser default will be
// used (depending on browser, DTD and system settings)
$font-family: sans-serif;
// fixed width font family, used in textarea
$font-family-fixed: monospace;
// tables
// border
@ -60,6 +52,14 @@ $bg-one: #e5e5e5;
$bg-two: #d5d5d5;
// Bootstrap
// ---------
// Typography
$font-family-base: sans-serif;
$font-family-monospace: monospace;
// Buttons
$enable-gradients: true;
$enable-shadows: true;
@ -71,10 +71,14 @@ $secondary: #ddd;
$btn-border-radius: 0.85rem;
$btn-line-height: 1.15;
// Card
$card-border-color: #999;
$card-bg: #f3f3f3;
$card-cap-bg: #bbb;
$card-cap-color: #fff;
// Alert
$alert-margin-bottom: 0.5em;
$alert-border-radius: 5px;