diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/original/css/common.css.php | 49 | ||||
| -rw-r--r-- | themes/pmahomme/css/codemirror.css.php | 298 | ||||
| -rw-r--r-- | themes/pmahomme/css/common.css.php | 39 | ||||
| -rw-r--r-- | themes/pmahomme/css/pmd.css.php | 1 |
4 files changed, 39 insertions, 348 deletions
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 0f3fcf052b..f9f3e2f0fc 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -281,38 +281,30 @@ table tr.even { text-align: <?php echo $left; ?>; } -<?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?> - /* marked table rows */ - td.marked, - table tr.marked td, - table tr.marked th, - table tr.marked { - background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>; - color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; - } - <?php +/* marked table rows */ +td.marked:not(.nomarker), +table tr.marked:not(.nomarker) td, +table tr.marked:not(.nomarker) th, +table tr.marked:not(.nomarker) { + background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>; + color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; } -?> -<?php if ($GLOBALS['cfg']['BrowsePointerEnable']) { ?> - /* hovered items */ - .odd:hover, - .even:hover, - .hover { - background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>; - color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; - } +/* hovered items */ +.odd:not(.nopointer):hover, +.even:not(.nopointer):hover, +.hover:not(.nopointer) { + background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>; + color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; +} - /* hovered table rows */ - table tr.odd:hover th, - table tr.even:hover th, - table tr.hover th { - background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>; - color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; - } - <?php +/* hovered table rows */ +table tr.odd:not(.nopointer):hover th, +table tr.even:not(.nopointer):hover th, +table tr.hover:not(.nopointer) th { + background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>; + color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; } -?> /** * marks table rows/cells if the db field is in a where condition @@ -2965,7 +2957,6 @@ html.ie7 #pma_console .query_input { font-size: 120%; } .cm-s-pma .CodeMirror-scroll { - padding-bottom: 2em; cursor: text; } diff --git a/themes/pmahomme/css/codemirror.css.php b/themes/pmahomme/css/codemirror.css.php index 909c6cf631..cac20a3437 100644 --- a/themes/pmahomme/css/codemirror.css.php +++ b/themes/pmahomme/css/codemirror.css.php @@ -14,267 +14,12 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { } ?> -/* PADDING */ - -.CodeMirror-lines { - padding: 4px 0; /* Vertical padding around content */ -} -.CodeMirror pre { - padding: 0 4px; /* Horizontal padding of content */ -} - -.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - background-color: white; /* The little square between H and V scrollbars */ -} - -/* GUTTER */ - -.CodeMirror-gutters { - border-right: 1px solid #ddd; - background-color: #f7f7f7; - white-space: nowrap; -} -.CodeMirror-linenumbers {} -.CodeMirror-linenumber { - padding: 0 3px 0 5px; - min-width: 20px; - text-align: right; - color: #999; -} - -/* CURSOR */ - -.CodeMirror div.CodeMirror-cursor { - border-left: 1px solid black; - z-index: 3; -} -/* Shown when moving in bi-directional text */ -.CodeMirror div.CodeMirror-secondarycursor { - border-left: 1px solid silver; -} -.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor { - width: auto; - border: 0; - background: #7e7; - z-index: 1; -} -/* Can style cursor different in overwrite (non-insert) mode */ -.CodeMirror div.CodeMirror-cursor.CodeMirror-overwrite {} - -.cm-tab { display: inline-block; } - -/* DEFAULT THEME */ - -.cm-s-default .cm-keyword {color: #708;} -.cm-s-default .cm-atom {color: #219;} -.cm-s-default .cm-number {color: #164;} -.cm-s-default .cm-def {color: #00f;} -.cm-s-default .cm-variable {color: black;} -.cm-s-default .cm-variable-2 {color: #05a;} -.cm-s-default .cm-variable-3 {color: #085;} -.cm-s-default .cm-property {color: black;} -.cm-s-default .cm-operator {color: black;} -.cm-s-default .cm-comment {color: #a50;} -.cm-s-default .cm-string {color: #a11;} -.cm-s-default .cm-string-2 {color: #f50;} -.cm-s-default .cm-meta {color: #555;} -.cm-s-default .cm-error {color: #f00;} -.cm-s-default .cm-qualifier {color: #555;} -.cm-s-default .cm-builtin {color: #30a;} -.cm-s-default .cm-bracket {color: #997;} -.cm-s-default .cm-tag {color: #170;} -.cm-s-default .cm-attribute {color: #00c;} -.cm-s-default .cm-header {color: blue;} -.cm-s-default .cm-quote {color: #090;} -.cm-s-default .cm-hr {color: #999;} -.cm-s-default .cm-link {color: #00c;} - -.cm-negative {color: #d44;} -.cm-positive {color: #292;} -.cm-header, .cm-strong {font-weight: bold;} -.cm-em {font-style: italic;} -.cm-link {text-decoration: underline;} - -.cm-invalidchar {color: #f00;} - -div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;} -div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;} - -/* STOP */ - -/* The rest of this file contains styles related to the mechanics of - the editor. You probably shouldn't touch them. */ - .CodeMirror { - line-height: 1; - position: relative; - overflow: hidden; - background: white; - color: black; - font-family: monospace; height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em; - resize: vertical; - max-height: 600px; - min-height: 75px; } - #inline_editor_outer .CodeMirror { height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 0.4); ?>em; } - -.CodeMirror-scroll { - /* 30px is the magic margin used to hide the element's real scrollbars */ - /* See overflow: hidden in .CodeMirror */ - height: 85% !important; - outline: none; /* Prevent dragging from highlighting the element */ - resize: none; - overflow-y: auto; -} -.CodeMirror-sizer { - position: relative; -} - -/* The fake, visible scrollbars. Used to force redraw during scrolling - before actuall scrolling happens, thus preventing shaking and - flickering artifacts. */ -.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - position: absolute; - z-index: 6; - display: none; -} -.CodeMirror-vscrollbar { - right: 0; top: 0; - overflow-x: hidden; - overflow-y: scroll; - display:none !important; -} -.CodeMirror-hscrollbar { - bottom: 0; left: 0; - overflow-y: hidden; - overflow-x: scroll; -} -.CodeMirror-scrollbar-filler { - right: 0; bottom: 0; -} -.CodeMirror-gutter-filler { - left: 0; bottom: 0; -} - -.CodeMirror-gutters { - position: absolute; left: 0; top: 0; - padding-bottom: 30px; - z-index: 3; - height: 100% !important; -} -.CodeMirror-gutter { - white-space: normal; - height: 100%; - padding-bottom: 30px; - margin-bottom: -32px; - display: inline-block; - /* Hack to make IE7 behave */ - *zoom:1; - *display:inline; -} -.CodeMirror-gutter-wrapper { - position: relative; -} -.CodeMirror-gutter-elt { - position: absolute; - cursor: default; - z-index: 4; -} - -.CodeMirror-lines { - cursor: text; -} -.CodeMirror pre { - /* Reset some styles that the rest of the page might have set */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; - border-width: 0; - background: transparent; - font-family: inherit; - font-size: inherit; - margin: 0; - white-space: pre; - word-wrap: normal; - line-height: inherit; - color: inherit; - z-index: 2; - position: relative; - overflow: visible; -} -.CodeMirror-wrap pre { - word-wrap: break-word; - white-space: pre-wrap; - word-break: normal; -} -.CodeMirror-code pre { - border-right: 30px solid transparent; - width: -webkit-fit-content; - width: -moz-fit-content; - width: fit-content; -} -.CodeMirror-wrap .CodeMirror-code pre { - border-right: none; - width: auto; -} -.CodeMirror-linebackground { - position: absolute; - left: 0; right: 0; top: 0; bottom: 0; - z-index: 0; -} - -.CodeMirror-linewidget { - position: relative; - z-index: 2; - overflow: auto; -} - -.CodeMirror-widget { - display: inline-block; -} - -.CodeMirror-wrap .CodeMirror-scroll { - overflow-x: hidden; -} - -.CodeMirror-measure { - position: absolute; - width: 100%; height: 0px; - overflow: hidden; - visibility: hidden; -} -.CodeMirror-measure pre { position: static; } - -.CodeMirror div.CodeMirror-cursor { - position: absolute; - visibility: hidden; - border-right: none; - width: 0; -} -.CodeMirror-focused div.CodeMirror-cursor { - visibility: visible; -} - -.CodeMirror-selected { background: #d9d9d9; } -.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; } - -.cm-searching { - background: #ffa; - background: rgba(255, 255, 0, .4); -} - -/* IE7 hack to prevent it from returning funny offsetTops on the spans */ -.CodeMirror span { *vertical-align: text-bottom; } - -@media print { - /* Hide the cursor when printing */ - .CodeMirror div.CodeMirror-cursor { - visibility: hidden; - } -} - span.cm-keyword, span.cm-statement-verb { color: #909; } @@ -308,54 +53,15 @@ span.cm-separator { span.cm-number { color: teal; } - .autocomplete-column-name { display: inline-block; } - .autocomplete-column-hint { display: inline-block; float: right; color: #666; margin-left: 1em; } - -/* CodeMirror Hints styling */ .CodeMirror-hints { - position: absolute; - z-index: 2000; - overflow: hidden; - list-style: none; - - margin: 0; - padding: 2px; - - -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); - -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); - box-shadow: 2px 3px 5px rgba(0,0,0,.2); - border-radius: 3px; - border: 1px solid silver; - - background: white; - font-size: 90%; - font-family: monospace; - - max-height: 20em; - overflow-y: auto; -} - -.CodeMirror-hint { - margin: 0; - padding: 0 4px; - border-radius: 2px; - max-width: 19em; - overflow: hidden; - white-space: pre; - color: black; - cursor: pointer; -} - -li.CodeMirror-hint-active { - background: #08f; - color: white; -} + z-index: 200; +}
\ No newline at end of file diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 769d9a1ff3..9194453e77 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -564,36 +564,30 @@ table tr.even { text-align: <?php echo $left; ?>; } -<?php if ($GLOBALS['cfg']['BrowseMarkerEnable']) { ?> - /* marked table rows */ - td.marked, - table tr.marked td, - table tr.marked th, - table tr.marked { +/* marked table rows */ +td.marked:not(.nomarker), +table tr.marked:not(.nomarker) td, +table tr.marked:not(.nomarker) th, +table tr.marked:not(.nomarker) { <?php echo $_SESSION['PMA_Theme']->getCssGradient('ced6df', 'b6c6d7'); ?> color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; - } - <?php -} ?> +} -<?php if ($GLOBALS['cfg']['BrowsePointerEnable']) { ?> - /* hovered items */ - .odd:hover, - .even:hover, - .hover { +/* hovered items */ +.odd:not(.nopointer):hover, +.even:not(.nopointer):hover, +.hover:not(.nopointer) { <?php echo $_SESSION['PMA_Theme']->getCssGradient('ced6df', 'b6c6d7'); ?> color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; - } +} - /* hovered table rows */ - table tr.odd:hover th, - table tr.even:hover th, - table tr.hover th { +/* hovered table rows */ +table tr.odd:not(.nopointer):hover th, +table tr.even:not(.nopointer):hover th, +table tr.hover:not(.nopointer) th { <?php echo $_SESSION['PMA_Theme']->getCssGradient('ced6df', 'b6c6d7'); ?> color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; - } - <?php -} ?> +} /** * marks table rows/cells if the db field is in a where condition @@ -3282,7 +3276,6 @@ html.ie7 #pma_console .query_input { font-size: 120%; } .cm-s-pma .CodeMirror-scroll { - padding-bottom: 2em; cursor: text; } diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php index 12e7b0d265..749b4ce6c2 100644 --- a/themes/pmahomme/css/pmd.css.php +++ b/themes/pmahomme/css/pmd.css.php @@ -571,6 +571,7 @@ h2.active { .side-menu.right { float: right; + right: 0; } .side-menu .hide { |