Skip to content

Commit

Permalink
Merge pull request #20 from ibennetch/themes4.7
Browse files Browse the repository at this point in the history
Update several themes for phpMyAdmin 4.7
  • Loading branch information
nijel committed Feb 20, 2017
2 parents d776365 + dc19555 commit 28f3386
Show file tree
Hide file tree
Showing 73 changed files with 2,478 additions and 2,727 deletions.
7 changes: 6 additions & 1 deletion fallen/css/common.css.php
Expand Up @@ -17,7 +17,7 @@
# Or the theme will be error!

$name = 'Fallen';
$version = '0.2';
$version = '0.4';
$slug = 'fallen';
$font_family_icon = 'Fallen' ?>
/* ----------------------------------------------------- */
Expand Down Expand Up @@ -134,3 +134,8 @@
---------------------------------------------- */

<?php include CSS_PATH . '/common/responsive.css.php' ?>

/* Miscellaneous
---------------------------------------------- */

<?php include CSS_PATH . '/common/misc.css.php' ?>
8 changes: 0 additions & 8 deletions fallen/css/fallen/common/globals.css.php
Expand Up @@ -526,10 +526,6 @@
border-top: 0.1px solid #eee
}

div#page_content form#db_search_form.ajax fieldset {
margin-top: -0.3em
}

.small_font {
font-size: smaller
}
Expand Down Expand Up @@ -877,10 +873,6 @@
max-height: initial
}

.firefox .cm-s-pma.CodeMirror {
font-size: 120%
}

.cm-s-pma .CodeMirror-scroll {
cursor: text
}
Expand Down
11 changes: 11 additions & 0 deletions fallen/css/fallen/common/misc.css.php
@@ -0,0 +1,11 @@
meter[value="1"]::-webkit-meter-optimum-value {
background: linear-gradient(white 3%, #E32929 5%, transparent 10%, #E32929);
}

meter[value="2"]::-webkit-meter-optimum-value {
background: linear-gradient(white 3%, #FF6600 5%, transparent 10%, #FF6600);
}

meter[value="3"]::-webkit-meter-optimum-value {
background: linear-gradient(white 3%, #FFD700 5%, transparent 10%, #FFD700);
}
16 changes: 10 additions & 6 deletions fallen/css/fallen/common/tables.css.php
Expand Up @@ -71,27 +71,27 @@
border: 1px solid <?php echo $GLOBALS['cfg']['BorderColor'] ?>
}

table tr.odd th, .odd {
table tbody:first-of-type tr:nth-child(odd), table tbody:first-of-type tr:nth-child(odd) th {
background: <?php echo $GLOBALS['cfg']['BgTwo'] ?>;
border-bottom: none
}

table tr.even th, .even {
table tbody:first-of-type tr:nth-child(even), table tbody:first-of-type tr:nth-child(even) th {
background: <?php echo $GLOBALS['cfg']['BgOne'] ?>;
border-bottom: none
}

table tr.odd th, table tr.odd, table tr.even th, table tr.even {
table tr th, table tr {
text-align: left;
border-bottom: 1px solid #eee
}

table tr.odd, table tr.even {
table tr {
border-left: 3px solid transparent;
line-height: 1em
}

td.marked:not(.nomarker), table tr.marked:not(.nomarker) td, table tr.marked:not(.nomarker) th, table tr.marked:not(.nomarker) {
td.marked:not(.nomarker), table tr.marked:not(.nomarker) td, table tbody:first-of-type tr.marked:not(.nomarker) th, table tr.marked:not(.nomarker) {
color: <?php echo $GLOBALS['cfg']['MainColor'] ?>
}

Expand All @@ -103,7 +103,7 @@
border-left: 3px solid #4285f4
}

table tr.odd:not(.nopointer):hover th, table tr.even:not(.nopointer):hover th, table tr.hover:not(.nopointer) th {
table tr.hover:not(.nopointer) th {
background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground'] ?>;
color: <?php echo $GLOBALS['cfg']['ThPointerColor'] ?>
}
Expand Down Expand Up @@ -145,6 +145,10 @@
margin: 0
}

.new_central_col {
width: 100%;
}

.tblcomment {
font-size: 70%;
font-weight: normal;
Expand Down
10 changes: 6 additions & 4 deletions fallen/css/printview.css
Expand Up @@ -78,11 +78,11 @@ th.column_heading, th.column_action {
border: .1em solid #000
}

table tr.odd, table tr.even {
table tr {
border-left: .1em solid #000
}

table tr.odd th, table tr.even th, table.data th {
table tr th, table.data th {
border-bottom: .1em solid #000
}

Expand Down Expand Up @@ -192,11 +192,13 @@ table tr.odd th, table tr.even th, table.data th {

/* For Odd-Even contrast */

table tr.odd th, table tr.odd td, .odd {
table tbody:first-of-type tr:nth-child(odd),
table tbody:first-of-type tr:nth-child(odd) th {
background: #fff
}

table tr.even th, table tr.even td, .even {
table tbody:first-of-type tr:nth-child(even),
table tbody:first-of-type tr:nth-child(even) th {
background: #dfdfdf
}

Expand Down
2 changes: 1 addition & 1 deletion fallen/info.inc.php
Expand Up @@ -10,4 +10,4 @@
# Theme info

$theme_name = 'Fallen';
$theme_full_version = '0.3';
$theme_full_version = '0.4';
Binary file modified fallen/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-bg_glass_65_ffffff_1x400.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-bg_glass_75_dadada_1x400.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-icons_222222_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-icons_2e83ff_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-icons_454545_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-icons_888888_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fallen/jquery/images/ui-icons_cd0a0a_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 28f3386

Please sign in to comment.