You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/03/15 08:56:55 UTC
svn commit: r1735032 - in
/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css:
./ breadcrumbs/ images/
Author: cziegeler
Date: Tue Mar 15 07:56:54 2016
New Revision: 1735032
URL: http://svn.apache.org/viewvc?rev=1735032&view=rev
Log:
Rework sample app and update UI
Added:
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css (with props)
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css (with props)
Removed:
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/breadcrumbs/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/iconFont.css
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/images/
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/jquery-breadcrumbs.css
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/jquery-ui.min.css
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/jquery-ui.structure.min.css
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/jquery-ui.theme.min.css
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/metro-bootstrap.min.css
Modified:
sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/slingshot.css
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css?rev=1735032&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css Tue Mar 15 07:56:54 2016
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
[... 4 lines stripped ...]
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/bootstrap.min.css
------------------------------------------------------------------------------
svn:keywords = Id
Added: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css?rev=1735032&view=auto
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css (added)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css Tue Mar 15 07:56:54 2016
@@ -0,0 +1,15 @@
+/*!
+ * IE10 viewport hack for Surface/desktop Windows 8 bug
+ * Copyright 2014-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+/*
+ * See the Getting Started docs for more information:
+ * http://getbootstrap.com/getting-started/#support-ie10-width
+ */
+@-webkit-viewport { width: device-width; }
+@-moz-viewport { width: device-width; }
+@-ms-viewport { width: device-width; }
+@-o-viewport { width: device-width; }
+@viewport { width: device-width; }
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/ie10-viewport-bug-workaround.css
------------------------------------------------------------------------------
svn:keywords = Id
Modified: sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/slingshot.css
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/slingshot.css?rev=1735032&r1=1735031&r2=1735032&view=diff
==============================================================================
--- sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/slingshot.css (original)
+++ sling/trunk/samples/slingshot/src/main/resources/SLING-INF/content/slingshot/resources/css/slingshot.css Tue Mar 15 07:56:54 2016
@@ -14,19 +14,55 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-.ui-form { width:470px; margin: 0 auto;}
-.ui-form .ui-widget-header h1 { margin:10px; text-align:center;}
-.ui-form .ui-widget-content {padding:10px;}
-.ui-form .ui-form-label {display: inline-block; width:150px; height: 25px; margin:10px;border: 1px solid #000000; color: #ffffff; background-color: #33cc33; text-align:center; font-weight: bold; vertical-align:middle;}
-.ui-form .ui-form-field {display: inline-block; width:244px; height: 25px; margin:10px;border: 1px solid #000000; vertical-align:middle;}
-.ui-form .ui-form-label label {vertical-align:middle; line-height:25px;}
-.ui-form-field input {width: 100%;}
-.ui-form-button {width:200px; height: 25px; margin:10px; border: 1px solid #000000; color: #ffffff; vertical-align:middle; background-color: #33cc33;}
-.ui-form-button-login { width:418px;}
-.ui-form-button-new {background-color: #aaaaff; width:197px;}
-.ui-form-button-help {background-color: #aaaaff; width:197px;}
-.ui-body-app {background: url("images/background.jpg") no-repeat center center fixed; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; background-size: cover;}
-.ui-slingshot-content {margin: 20px; padding: 10px;}
-.ui-slingshot-main {margin: 20px; padding: 10px; background-color: #dddddd; }
-.ui-slingshot-main h1 {margin: 10px; text-align:center; }
-.ui-slingshot-comments {float:none; margin:10px; padding: 10px; display:block; width:100%;}
\ No newline at end of file
+body {
+ padding-top: 50px;
+ padding-bottom: 20px;
+}
+body.login {
+ padding-top: 40px;
+ padding-bottom: 40px;
+ background-color: #eee;
+ background: url('../images/background.jpg');
+ background-repeat: no-repeat;
+ background-position: center center;
+ background-attachment: fixed;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
+}
+
+.form-signin {
+ max-width: 330px;
+ padding: 15px;
+ margin: 0 auto;
+}
+.form-signin .form-signin-heading,
+.form-signin .checkbox {
+ margin-bottom: 10px;
+}
+.form-signin .checkbox {
+ font-weight: normal;
+}
+.form-signin .form-control {
+ position: relative;
+ height: auto;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 10px;
+ font-size: 16px;
+}
+.form-signin .form-control:focus {
+ z-index: 2;
+}
+.form-signin input[type="text"] {
+ margin-bottom: -1px;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+}
+.form-signin input[type="password"] {
+ margin-bottom: 10px;
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
\ No newline at end of file