From 250ac74fbdba4d977fcbaa431b2026b7f321e8c3 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 28 Nov 2012 13:25:41 -0800 Subject: [PATCH] Move bootstrap to core. Removed tipsy (replaced by tooltip) --- e107_admin/auth.php | 13 +- e107_admin/header.php | 4 +- e107_themes/bootstrap/admin_style.css | 37 +- e107_themes/bootstrap/admin_template.php | 2 +- e107_themes/bootstrap/admin_theme.php | 6 +- .../bootstrap/css/bootstrap-responsive.css | 1088 --- e107_themes/bootstrap/css/bootstrap.css | 5893 ----------------- e107_themes/bootstrap/css/bootstrap.min.css | 9 - e107_themes/bootstrap/img/e107_adminlogo.png | Bin 3285 -> 0 bytes e107_themes/bootstrap/js/bootstrap.js | 2025 ------ e107_themes/bootstrap/js/bootstrap.min.js | 6 - .../css/bootstrap-responsive.min.css | 0 e107_web/js/bootstrap/css/bootstrap.min.css | 851 +++ .../img/glyphicons-halflings-white.png | Bin .../bootstrap/img/glyphicons-halflings.png | Bin e107_web/js/bootstrap/js/bootstrap.min.js | 7 + e107_web/js/core/admin.jquery.js | 6 +- e107_web/js/core/all.jquery.js | 2 +- e107_web/js/tooltip/jquery.tipsy.js | 241 - e107_web/js/tooltip/tipsy.css | 25 - 20 files changed, 897 insertions(+), 9318 deletions(-) delete mode 100644 e107_themes/bootstrap/css/bootstrap-responsive.css delete mode 100644 e107_themes/bootstrap/css/bootstrap.css delete mode 100644 e107_themes/bootstrap/css/bootstrap.min.css delete mode 100644 e107_themes/bootstrap/img/e107_adminlogo.png delete mode 100644 e107_themes/bootstrap/js/bootstrap.js delete mode 100644 e107_themes/bootstrap/js/bootstrap.min.js rename {e107_themes => e107_web/js}/bootstrap/css/bootstrap-responsive.min.css (100%) create mode 100644 e107_web/js/bootstrap/css/bootstrap.min.css rename {e107_themes => e107_web/js}/bootstrap/img/glyphicons-halflings-white.png (100%) rename {e107_themes => e107_web/js}/bootstrap/img/glyphicons-halflings.png (100%) create mode 100644 e107_web/js/bootstrap/js/bootstrap.min.js delete mode 100644 e107_web/js/tooltip/jquery.tipsy.js delete mode 100644 e107_web/js/tooltip/tipsy.css diff --git a/e107_admin/auth.php b/e107_admin/auth.php index 569b2dacb..8b6643b84 100644 --- a/e107_admin/auth.php +++ b/e107_admin/auth.php @@ -271,7 +271,7 @@ else e107::css('inline'," - body { text-align: left; font-size:15px; line-height:1.5em; font-weight:normal; font-family:Arial, Helvetica, sans-serif; background:#081D28 url(".e_IMAGE."logo_template_large.png) no-repeat 50% 10px; } + body { text-align: left; font-size:15px; line-height:1.5em; font-weight:normal; font-family:Arial, Helvetica, sans-serif; background:#081D28 url(".e_IMAGE."logo_template_large.png) no-repeat 50% 40px; } a { color:#F6931E; text-decoration:none; } a:hover { color:silver; text-decoration:none; } .bold { font-weight:bold; } @@ -297,12 +297,14 @@ else .field input:hover { border:1px solid #F6931E; } - + #login-admin { margin-left:auto; margin-right:auto; - margin-top:200px; + margin-top:12%; + width:400px; + /* padding: 10px 20px 0 20px; -moz-border-radius:5px; -webkit-border-radius:5px; @@ -311,6 +313,7 @@ else -webkit-box-shadow:5px 5px 20px #000000; box-shadow:5px 5px 20px #000000; background-color: #FEFEFE; + */ } #login-admin label { display: none; text-align: right } @@ -369,9 +372,9 @@ class auth $class = (e_QUERY == 'failed') ? "class='e-shake'" : ""; $text = "
-
+
-

".e_DOMAIN." admin area

+

".e_DOMAIN." admin area

diff --git a/e107_admin/header.php b/e107_admin/header.php index ce4a85a92..c1cc4290a 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -44,8 +44,8 @@ e107::js('core', 'password/jquery.pwdMeter.js', 'jquery', 2); // e107::js("core", "core/mediaManager.js","jquery",3); -e107::js("core", "tooltip/jquery.tipsy.js","jquery",3); -e107::css('core', 'tooltip/tipsy.css', 'jquery'); +//e107::js("core", "tooltip/jquery.tipsy.js","jquery",3); +//e107::css('core', 'tooltip/tipsy.css', 'jquery'); e107::js("core", "tags/jquery.tagit.js","jquery",3); e107::css('core', 'tags/jquery.tagit.css', 'jquery'); diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 647f83757..4259f7fae 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -8,21 +8,26 @@ } .tipsy-inner { padding:10px; font-size:15px; } - + +.tooltip { font-size: 13px; } +.tooltip-inner { box-shadow: 0 2px 5px #808080; -webkit-box-shadow: 0 2px 5px #808080; -moz-box-shadow: 0 2px 5px #808080; } + + + /* Core Formatting */ -.left { text-align: left } -.right { text-align: right } -.center { text-align: center } -.f-left { float: left } -.f-right { float: right } -.top { vertical-align: top } -.middle { vertical-align: middle } -.bottom { vertical-align: bottom } -.clear { clear: both } -.clear-l { clear: right } -.clear-r { clear: left } -.smalltext { font-size: 11px; } -.nowrap { white-space:nowrap; } +.left { text-align: left } +.right { text-align: right } +.center { text-align: center } +.f-left { float: left } +.f-right { float: right } +.top { vertical-align: top } +.middle { vertical-align: middle } +.bottom { vertical-align: bottom } +.clear { clear: both } +.clear-l { clear: right } +.clear-r { clear: left } +.smalltext { font-size: 11px; } +.nowrap { white-space:nowrap; } .core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; } @@ -33,7 +38,7 @@ td.center, th.center { text-align:center } .col-label { width:30%; } .sidebar-nav { padding: 9px 0; font-size:11px; min-width:150px; } - +/* a.brand:hover img { filter: blur(13px); -webkit-filter: blur(13px); @@ -41,7 +46,7 @@ a.brand:hover img { -o-filter: blur(13px); -ms-filter: blur(13px); } - +*/ @media (min-width: 1300px) { .sidebar-nav { font-size:12px; } diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php index 8a6926880..dbc3af42e 100644 --- a/e107_themes/bootstrap/admin_template.php +++ b/e107_themes/bootstrap/admin_template.php @@ -135,7 +135,7 @@ $E_ADMIN_NAVIGATION['end'] = ''; $ADMIN_HEADER = '