summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/admin_wind/css/screen.css110
-rw-r--r--themes/admin_wind/views/admin.html.php4
-rw-r--r--themes/wind/css/screen.css218
3 files changed, 21 insertions, 311 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 25302407..13174df9 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -11,6 +11,8 @@
* 5) Navigation and menus
* 6) jQuery and jQuery UI
* 7) Right-to-left language styles
+ *
+ * @todo Consider moving g-panel to gallery.common
*/
/** *******************************************************************
@@ -165,27 +167,24 @@ th {
opacity: 0.4;
}
-tr.g-error,
-tr.g-info,
-tr.g-success,
-tr.g-warning {
- background: none;
-}
-
-.g-info td.g-info {
+.g-info td {
background-color: transparent;
+ background-image: none;
}
-.g-success td.g-success {
+.g-success td {
background-color: transparent;
+ background-image: none;
}
.g-error td {
background-color: #f6cbca;
+ background-image: none;
}
.g-warning td {
background-color: #fcf9ce;
+ background-image: none;
}
.g-module-status.g-info,
@@ -281,19 +280,6 @@ tr.g-warning {
/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-header #g-login-menu li,
-#g-footer #g-credits li {
- display: inline;
-}
-
-#g-header #g-login-menu li {
- padding-left: 1.2em;
-}
-
-#g-footer #g-credits li {
- padding-right: 1.2em;
-}
-
#g-content #g-search-results {
margin-top: 1em;
padding-top: 1em;
@@ -332,10 +318,6 @@ tr.g-warning {
width: 90px;
}
-#g-site-status {
- margin-bottom: 0;
-}
-
#g-content .g-item {
background-color: #fff;
border: 1px solid #e8e8e8;
@@ -347,15 +329,6 @@ tr.g-warning {
width: 90px;
}
-#g-admin-comments-menu {
- margin: 1em 0;
-}
-
-#g-admin-comments-menu a {
- margin: 0;
- padding: .2em .6em;
-}
-
#g-admin-graphics .g-available .g-block {
clear: none;
float: left;
@@ -407,10 +380,6 @@ tr.g-warning {
* 5) Navigation and menus
*********************************************************************/
-#g-site-admin-menu {
- font-size: 1.2em;
-}
-
/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-header #g-login-menu {
@@ -439,7 +408,8 @@ tr.g-warning {
/* Superfish menu overrides ~~~~~~~~~~~~~~ */
-.sf-menu li li, .sf-menu li li ul li {
+.sf-menu li li,
+.sf-menu li li ul li {
background-color: #bdd2ff;
}
@@ -462,10 +432,6 @@ tr.g-warning {
border: none;
}
-.ui-draggable {
- cursor: move;
-}
-
#g-admin-dashboard .ui-state-highlight,
#g-sidebar .ui-state-highlight {
height: 2em;
@@ -510,24 +476,8 @@ tr.g-warning {
margin-left: .2em;
}
-.ui-icon-rotate-ccw {
- background-position: -192px -64px;
-}
-
-.ui-icon-rotate-cw {
- background-position: -208px -64px;
-}
-
/*************** STUFF THAT NEEDS A HOME ****************/
-#g-move ul {
- padding-left: 1em;
-}
-
-#g-move .selected {
- background: #999;
-}
-
.g-progress-bar {
height: 1em;
width: 100%;
@@ -535,46 +485,6 @@ tr.g-warning {
display: inline-block;
}
-#g-admin-g2-import-notes {
- padding-bottom: 20px;
-}
-
-#g-admin-g2-import-details {
- padding-top: 20px;
-}
-
-#g-admin-g2-import-details .g-warning {
- margin-top: 4px;
-}
-
-#g-admin-g2-import-details .g-info {
- padding: 2px;
- border: 1px solid #999;
- margin-bottom: 10px;
-}
-
-#g-admin-g2-import-notes p,
-#g-admin-g2-import-details .g-info p {
- padding: 0;
- margin: 0;
-}
-
-#g-admin-g2-import-notes ul li,
-#g-admin-g2-import .g-info ul li {
- padding-left: 0;
- margin-left: 20px;
- list-style-type: disc;
-}
-
-.g-editable {
- padding: .1em .3em .2em .3em;
-}
-
-.g-editable:hover {
- background-color: #ffc;
- cursor: text;
-}
-
#g-task-log-dialog h1 {
font-size: 1.1em;
}
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index b788eb93..bbdde734 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -43,7 +43,7 @@
<?= $theme->site_status() ?>
<div id="g-header">
<?= $theme->admin_header_top() ?>
- <ul id="g-login-menu">
+ <ul id="g-login-menu" class="g-inline">
<li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
<li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
</ul>
@@ -70,7 +70,7 @@
</div>
<? endif ?>
</div>
- <div id="g-footer">
+ <div id="g-footer" class="g-inline ui-helper-clearfix">
<?= $theme->admin_footer() ?>
<div>
<?= $theme->admin_credits() ?>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 84b8b090..6e370a7f 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -9,11 +9,10 @@
* 3) Page layout containers
* 4) Content blocks in specific layout containers
* 5) Navigation and menus
- * 6) Browser hacks
- * 7) jQuery and jQuery UI
- * 8) Right-to-left language styles
+ * 6) jQuery and jQuery UI
+ * 7) Right-to-left language styles
*
- * @todo Move #g-admin-g2-import stuff to g2import module
+ * @todo Review g-buttonset and it's usage here and admin_wind
*/
/** *******************************************************************
@@ -41,10 +40,6 @@ h1 {
font-size: 1.7em;
}
-#g-search-results h1 {
- margin-bottom: 1em;
-}
-
#g-progress h1 {
font-size: 1.1em;
}
@@ -285,50 +280,6 @@ td {
margin: 1em auto;
}
-#g-content #g-comments {
- margin-top: 2em;
- position: relative;
-}
-
-#g-content #g-comments ul li {
- margin: 1em 0;
-}
-
-#g-content #g-comments .g-author {
- border-bottom: 1px solid #ccc;
- color: #999;
- height: 32px;
- line-height: 32px;
-}
-
-#g-content #g-comments ul li div {
- padding: 0 8px 8px 43px;
-}
-
-#g-content #g-comments ul li #g-recaptcha {
- padding: 0;
-}
-
-#g-content #g-comments ul li #g-recaptcha div {
- padding: 0;
-}
-
-#g-content #g-comments .g-avatar {
- height: 32px;
- margin-right: .4em;
- width: 32px;
-}
-
-#g-admin-comment-button {
- position: absolute;
- right: 0;
- top: 2px;
-}
-
-#g-content #g-comment-form {
- margin-top: 2em;
-}
-
/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
#g-footer #g-credits li {
@@ -371,7 +322,7 @@ td {
margin-bottom: 0 !important;
}
-/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Context Menu ~~~~~~~~~~~~~~~~~~~~~~~~~ */
.g-context-menu {
background-color: #fff;
@@ -446,17 +397,14 @@ td {
background-image: url('../images/ico-print.png');
}
-#g-welcome-message p {
- padding-bottom: 1em;
-}
-
/** *******************************************************************
* 6) jQuery and jQuery UI
*********************************************************************/
/* Superfish menu overrides ~~~~~~~~~~~~~~ */
-.sf-menu li li, .sf-menu li li ul li {
+.sf-menu li li,
+.sf-menu li li ul li {
background-color: #bdd2ff;
}
@@ -495,157 +443,9 @@ td {
margin-left: .2em;
}
-.ui-icon-rotate-ccw {
- background-position: -192px -64px;
-}
-
-.ui-icon-rotate-cw {
- background-position: -208px -64px;
-}
-
-/* STUFF THAT NEEDS A HOME */
-
-#g-move ul {
- padding-left: 1em;
-}
-
-#g-move .selected {
- background: #999;
-}
-
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-edit-permissions-form {
- clear: both;
-}
-
-#g-edit-permissions-form td {
- background-image: none;
-}
-
-#g-edit-permissions-form fieldset {
- border: 1px solid #ccc;
- padding: 0;
-}
-
-#g-permissions .g-denied,
-#g-permissions .g-allowed {
- text-align: center;
- vertical-align: middle;
-}
-
-#g-permissions .g-denied {
- background-color: #fcc;
-}
-
-#g-permissions .g-allowed {
- background-color: #cfc;
-}
-
-/*************** STUFF THAT NEEDS A HOME ****************/
-
-#g-add-photos #SWFUpload_0 {
- position: relative;
- top: -200px;
- left: 134px;
-}
-#g-add-photos .g-breadcrumbs {
- border: 0;
- margin: 0;
- padding-left:10px;
-}
-#g-add-photos-canvas {
- border: 1px solid #ccc;
- margin: .5em 0 .5em 0;
- width: 469px;
- height: 325px;
- overflow: auto;
-}
-#g-add-photos button {
- margin-bottom: .5em;
- float: right;
-}
-#g-uploadqueue-infobar {
- clear: both;
-}
-#g-uploadqueue-infobar #g-cancelupload {
- display: none;
- cursor: pointer;
-}
-
-#g-add-photos-canvas {
-
-}
-
-#g-add-photos-queue .progressbar {
- height: 4px;
-}
-
-#g-add-photos-queue .title {
- font-size: 1.25em;
-}
-
-#g-add-photos-queue .status {
- font-size: .75em;
-}
-
-#g-add-photos-queue .box {
- margin-bottom: 8px;
- padding: 4px;
-}
-
-#g-add-photos-queue .pending {
- background-color: #e8e8e8;
- border: 1px solid #d7d7d7;
-}
-
-#g-add-photos-queue .error {
- background-color: #fcc;
- border: 1px solid #ebb;
-}
-
-#g-add-photos-queue .uploading {
- background-color: #ff9;
- border: 1px solid #ee8;
-}
-
-#g-add-photos-queue .complete {
- background-color: #cfc;
- border: 1px solid #beb;
-}
-
-#g-admin-g2-import-notes {
- padding-bottom: 20px;
-}
-
-#g-admin-g2-import-details {
- padding-top: 20px;
-}
-
-#g-admin-g2-import-details .g-warning {
- margin-top: 4px;
-}
-
-#g-admin-g2-import-details .g-info {
- padding: 2px;
- border: 1px solid #999;
- margin-bottom: 10px;
-}
-
-#g-admin-g2-import-notes p,
-#g-admin-g2-import-details .g-info p {
- padding: 0;
- margin: 0;
-}
-
-#g-admin-g2-import-notes ul li,
-#g-admin-g2-import .g-info ul li {
- padding-left: 0;
- margin-left: 20px;
- list-style-type: disc;
-}
-
-/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+/** *******************************************************************
+ * 6) Right to left styles
+ *********************************************************************/
.rtl {
direction: rtl;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 22:03:06 +0000