ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsetrak...@apache.org
Subject svn commit: r1651240 - in /incubator/ignite/site/branches/sidenav: computing.html css/all.css index.html scss/all.scss
Date Tue, 13 Jan 2015 00:14:17 GMT
Author: dsetrakyan
Date: Tue Jan 13 00:14:16 2015
New Revision: 1651240

URL: http://svn.apache.org/r1651240
Log:
Applying sidenav patch with carousel updates

Modified:
    incubator/ignite/site/branches/sidenav/computing.html
    incubator/ignite/site/branches/sidenav/css/all.css
    incubator/ignite/site/branches/sidenav/index.html
    incubator/ignite/site/branches/sidenav/scss/all.scss

Modified: incubator/ignite/site/branches/sidenav/computing.html
URL: http://svn.apache.org/viewvc/incubator/ignite/site/branches/sidenav/computing.html?rev=1651240&r1=1651239&r2=1651240&view=diff
==============================================================================
--- incubator/ignite/site/branches/sidenav/computing.html (original)
+++ incubator/ignite/site/branches/sidenav/computing.html Tue Jan 13 00:14:16 2015
@@ -90,58 +90,42 @@
             <div class="row">
                 <!-- Side Nav -->
                 <nav class="col-md-3 hidden-xs hidden-sm sidebar" role="navigation">
-                    <ul class="nav-stacked affix list-unstyled">
-
-                        <li><a href="#hpc">High Performance Computing</a></li>
-                            <ul class="list-unstyled sidebar-sub-menu">
+                    <ul class="nav nav-stacked affix list-unstyled">
 
+                        <li><a href="#hpc">High Performance Computing</a>
+                            <ul class="nav nav-stacked list-unstyled sidebar-sub-menu">
                                 <li><a href="#clustering">Clustering</a></li>
-
                                 <li><a href="#distributedmessaging">Distributed
Messaging</a></li>
-
                                 <li><a href="#distributedevents">Distributed
Events</a></li>
-
                                 <li><a href="#distributedservices">Distributed
Services</a></li>
-
                             </ul>
+                        </li>
 
                         <li><a href="">Data Grid</a>
-                            <ul class="list-unstyled sidebar-sub-menu">
-
+                            <ul class="nav nav-stacked list-unstyled sidebar-sub-menu">
                                 <li><a href="">Distributed Caching</a></li>
-
                                 <li><a href="">Web Session Clustering</a></li>
-
                                 <li><a href="">Hibernate L2 Cache</a></li>
-
                                 <li><a href="">Distributed Data Structures</a></li>
-
                                 <li><a href="">Distributed Cache Queries</a></li>
-
                                 <li><a href="">Distributed Transactions</a></li>
-
                                 <li><a href="">Distributed Locking</a></li>
-
                             </ul>
                         </li>
 
                         <li><a href="">Streaming</a>
-                            <ul class="list-unstyled sidebar-sub-menu">
-
+                            <ul class="nav nav-stacked list-unstyled sidebar-sub-menu">
                                 <li><a href="">Complex Event Processing</a></li>
-
                             </ul>
                         </li>
 
                         <li><a href="">Hadoop Acceleration</a>
-                            <ul class="list-unstyled sidebar-sub-menu">
-
+                            <ul class="nav nav-stacked list-unstyled sidebar-sub-menu">
                                 <li><a href="">Distributed File System</a></li>
-
                                 <li><a href="">MapReduce</a></li>
-
                             </ul>
                         </li>
+
                     </ul>
                 </nav>
 

Modified: incubator/ignite/site/branches/sidenav/css/all.css
URL: http://svn.apache.org/viewvc/incubator/ignite/site/branches/sidenav/css/all.css?rev=1651240&r1=1651239&r2=1651240&view=diff
==============================================================================
--- incubator/ignite/site/branches/sidenav/css/all.css (original)
+++ incubator/ignite/site/branches/sidenav/css/all.css Tue Jan 13 00:14:16 2015
@@ -7630,7 +7630,10 @@ p {
 
 .sidebar {
   display: block;
-  padding: 95px 20px;
+  padding: 100px 20px;
+}
+.sidebar .nav > li > a {
+  padding: 5px 5px;
 }
 .sidebar a {
   display: block;
@@ -7638,23 +7641,17 @@ p {
   font-weight: 900;
   color: #808080;
   padding-left: 10px;
-  margin-top: 15px;
-  margin-bottom: 15px;
 }
 .sidebar a:hover {
   color: #f00;
   background-color: transparent;
-  border-left: 1px solid #f00;
-}
-.sidebar li.active a {
-  color: #f00;
-  background-color: transparent;
-  border-left: 2px solid #f00;
 }
 
-.sidebar-sub-menu a {
-  margin-top: 15px;
-  margin-bottom: 15px;
+.sidebar-sub-menu li {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+.sidebar-sub-menu li a {
   margin-left: 20px;
   font-size: 15px;
   font-weight: 400;

Modified: incubator/ignite/site/branches/sidenav/index.html
URL: http://svn.apache.org/viewvc/incubator/ignite/site/branches/sidenav/index.html?rev=1651240&r1=1651239&r2=1651240&view=diff
==============================================================================
--- incubator/ignite/site/branches/sidenav/index.html (original)
+++ incubator/ignite/site/branches/sidenav/index.html Tue Jan 13 00:14:16 2015
@@ -82,12 +82,13 @@
 
 		</header>
 
-		<div id="carousel" class="carousel slide" data-ride="carousel">
+		<div id="carousel" class="carousel slide" data-ride="carousel" data-interval="3000">
 
 			<div class="container">
 
 				<div class="carousel-inner" role="listbox">
 
+                    <!-- Carousel items -->
 					<div class="item active">
 
 						<header>
@@ -162,6 +163,15 @@
 
 			</div>
 
+            <!-- Carousel nav -->
+            <a class="carousel-control left" href="#carousel" role="button" data-slide="prev">
+                <span class="glyphicon glyphicon-chevron-left"></span>
+            </a>
+
+            <a class="carousel-control right" href="#carousel" role="button" data-slide="next">
+                <span class="glyphicon glyphicon-chevron-right"></span>
+            </a>
+
 		</div>
 
 		<main id="main" role="main" class="container">

Modified: incubator/ignite/site/branches/sidenav/scss/all.scss
URL: http://svn.apache.org/viewvc/incubator/ignite/site/branches/sidenav/scss/all.scss?rev=1651240&r1=1651239&r2=1651240&view=diff
==============================================================================
--- incubator/ignite/site/branches/sidenav/scss/all.scss (original)
+++ incubator/ignite/site/branches/sidenav/scss/all.scss Tue Jan 13 00:14:16 2015
@@ -775,37 +775,33 @@ p {
 }
 .sidebar {
     display: block;
-    padding: 95px 20px;
+    padding: 100px 20px;
+    .nav > li > a {
+      padding: 5px 5px;
+    }
     a {
         display: block;
         font-size: 18px;
         font-weight: 900;
         color: #808080;
         padding-left:10px;
-        margin-top: 15px;
-        margin-bottom: 15px;
 
         &:hover{
             color: $red;
             background-color: transparent;
-            border-left: 1px solid $red;
         }
     }
-
-    li.active a {
-        color: $red;
-        background-color: transparent;
-        border-left: 2px solid $red;
-    }
 }
 .sidebar-sub-menu {
-    a {
-        margin-top: 15px;
-        margin-bottom: 15px;
-        margin-left: 20px;
-        font-size: 15px;
-        font-weight: 400;
-        color: #999;
+    li{
+        margin-top: 2px;
+        margin-bottom: 2px;
+        a {
+            margin-left: 20px;
+            font-size: 15px;
+            font-weight: 400;
+            color: #999;
+        }
     }
 }
 .main-content {
@@ -867,7 +863,6 @@ p {
         margin: 0;
         padding: 30px 0 0;
     }
-
     h2 {
         position: relative;
         padding: 3px 0 12px 40px;
@@ -903,7 +898,6 @@ p {
         margin: 0;
         padding: 30px 0 0;
     }
-
     h2 {
         position: relative;
         padding: 3px 0 12px 40px;
@@ -939,7 +933,6 @@ p {
         margin: 0;
         padding: 30px 0 0;
     }
-
     h2 {
         position: relative;
         padding: 3px 0 12px 40px;
@@ -975,7 +968,6 @@ p {
         margin: 0;
         padding: 30px 0 0;
     }
-
     h2 {
         position: relative;
         padding: 3px 0 12px 40px;



Mime
View raw message