Merge branch 'master' of github.com:t3framework/t3

t3framework · Nov 30, 2013 · ec86f6c · ec86f6c
2 parents c0f6835 + 3c4d8ad
commit ec86f6c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 98 deletions.
diff --git a/source/plg_system_t3/base-bs3/less/off-canvas.less b/source/plg_system_t3/base-bs3/less/off-canvas.less
@@ -76,6 +76,7 @@ body {
     opacity: 0;
     -webkit-transition: opacity 0.5s, width 0.1s 0.5s, height 0.1s 0.5s;
     transition: opacity 0.5s, width 0.1s 0.5s, height 0.1s 0.5s;
+    z-index: 100;
   }
 }
 

diff --git a/source/tpl_t3_bs3_blank/less/joomla.less b/source/tpl_t3_bs3_blank/less/joomla.less
@@ -47,7 +47,6 @@
   margin: 0 0 (@t3-global-margin * 2);
   border: 0;
   border-top: 1px solid @hr-border;
-  border-bottom: 1px solid @white;
 }
 
 

diff --git a/source/tpl_t3_bs3_blank/less/themes/dark/template.less b/source/tpl_t3_bs3_blank/less/themes/dark/template.less
@@ -12,91 +12,16 @@
  */
 
 
-
 //
 // GENERIC ARTICLE STYLES
 // ---------------------------------------------------------
 .page-header {
   border-bottom: 1px solid @gray-dark;
 }
 
-// Page Subheader
-// --------------
-.page-subheader {
-  border-bottom: 1px solid @gray-dark;
-}
-
-// Divider
-.divider-vertical {
-  border-top: 1px solid @gray-darker;
-  border-bottom: 1px solid @gray-dark;
-}
-
-
-// ---------------------------------------------------------
-// HEADER
-// ---------------------------------------------------------
-
-// Logo Text
-// ----------
-.logo-text h1 {
-	color: @white;
-}
-
-.logo-text h1 a {
-	color: @white;
-}
-
-// Taglines
-.logo-text .site-slogan {
-  display: block;
-  font-size: @font-size-base;
-  margin-top: 5px;
-}
-
-
-// Head Search
-// -----------
-.head-search .input {
-}
-
-/* focus state */
-.head-search .input:focus {
-  color: @white;
-}
-
-
-//
-// DEFAULT JOOMLA! MENU 
-// ------------------------------------------------------
-.module_menu .nav > li {
-  border-top: 1px solid @gray-dark;
-}
-
-
-// Active nav items
-.t3-mainnav.inverted .navbar .nav > .active > a,
-.t3-mainnav.inverted .navbar .nav > .active > a:hover,
-.t3-mainnav.inverted .navbar .nav > .active > a:focus {
-  color: @white;
-  #gradient > .vertical(lighten(@blue, 10%), @blue);
-}
-
-// Shitty
-.input-append .add-on, .input-prepend .add-on {
-  background: #444;
-}
-
-
-.nav-tabs.nav-stacked > li > a,
-.pagination a, .pagination span {
-  border-color: #444;
-}
-
-.pagination a:hover, .pagination .active a, .pagination .active span,
-.pagination a, .pagination span {
-  background: #444;
-}
-
-
-.btn { text-shadow: none;}
+// Article Images
+// -------------------------
+.img_caption p.img_caption {
+  background: @gray-dark;
+  color: @gray-light;
+}
diff --git a/source/tpl_t3_bs3_blank/less/themes/dark/variables.less b/source/tpl_t3_bs3_blank/less/themes/dark/variables.less
@@ -40,28 +40,46 @@
 @link-color:                    #fff;
 
 
+// Forms
+// -------------------------
+@input-bg:                       @gray-dark;
+@input-border:                   @gray-darker;
+
+
+// Buttons
+// -------------------------
+@btn-default-color:              #fff;
+@btn-default-bg:                 @gray-dark;
+@btn-default-border:             @gray-darker;
+
+
+// Hr border color
+// -------------------------
+@hr-border:                      @gray-dark;
+
+
 // Dropdowns
 // -------------------------
 @dropdown-bg:                    @navbar-inverse-bg;
 @dropdown-border:                @navbar-inverse-border;
 @dropdown-fallback-border:       #555;
 @dropdown-divider-bg:            #333;
 
-@dropdown-link-color:            @gray-dark;
-@dropdown-link-hover-color:      @gray-dark;
-@dropdown-link-hover-bg:         @gray;
+@dropdown-link-color:            @gray-lighter;
+@dropdown-link-hover-color:      #fff;
+@dropdown-link-hover-bg:         @gray-dark;
 
-@dropdown-caret-color:           @gray-dark;
+@dropdown-caret-color:           @gray-lighter;
 
 
 // Navbar: Using Navbar Inverse Variables
 // --------------------------------------
 @navbar-default-color:                    @gray-lighter;
-@navbar-default-bg:                       @navbar-inverse-bg;
-@navbar-default-border:                   @navbar-inverse-border;
+@navbar-default-bg:                       @gray-dark;
+@navbar-default-border:                   @gray-darker;
 
 // Navbar links
-@navbar-default-link-color:               @navbar-inverse-link-color;
+@navbar-default-link-color:               @gray-lighter;
 @navbar-default-link-hover-color:         @navbar-inverse-link-hover-color;
 @navbar-default-link-hover-bg:            @navbar-inverse-link-hover-bg;
 @navbar-default-link-active-color:        @navbar-inverse-link-active-color;
@@ -79,21 +97,24 @@
 @navbar-default-toggle-border-color:      @navbar-inverse-toggle-border-color;
 
 
-// Buttons
+// Pagination
 // -------------------------
-@btn-default-bg:                  @gray-dark;
-@btn-default-border:              darken(@gray-dark, 10%);
+@pagination-bg:                        @gray-dark;
+@pagination-border:                    @gray-darker;
 
+@pagination-hover-bg:                  @gray;
 
-// Forms
-// -------------------------
-@input-bg:                        @gray-dark;
-@input-border:                    @gray;
+@pagination-active-bg:                 @brand-primary;
+@pagination-active-color:              #fff;
 
+@pagination-disabled-color:            @gray;
 
-// Hr border color
+
+// Breadcrumbs
 // -------------------------
-@hr-border:                       @gray-dark;
+@breadcrumb-bg:                 @gray-dark;
+@breadcrumb-color:              @gray-lighter;
+@breadcrumb-active-color:       @white;