Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed # toplink on "Change" buttons + styled input/textarea fields …

…+ css3 hover transitions + user-select:none on buttons + slider/autocomplete handle z-index + background bleed through progress bar bug
  • Loading branch information...
commit 0df539c2dfe1e2cd5a01c7e0de4bc33cbffe31e5 1 parent 14346b2
@taitems taitems authored
Showing with 103 additions and 41 deletions.
  1. +39 −4 css/Aristo/jquery-ui-1.8.7.custom.css
  2. +64 −37 demo.html
View
43 css/Aristo/jquery-ui-1.8.7.custom.css
@@ -401,7 +401,7 @@
* http://docs.jquery.com/UI/Autocomplete#theming
*/
.ui-autocomplete {
- position: absolute; cursor: default;
+ position: absolute; cursor: default; z-index: 3 !important;
-moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-moz-box-shadow: 0 1px 5px rgba(0,0,0,0.3);
-webkit-box-shadow: 0 1px 5px rgba(0,0,0,0.3);
@@ -463,12 +463,19 @@
*
* http://docs.jquery.com/UI/Button#theming
*/
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; -webkit-user-select: none; -moz-user-select: none; user-select: none; } /* the overflow property removes extra width in IE */
.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
.ui-button-icons-only { width: 3.4em; }
button.ui-button-icons-only { width: 3.7em; }
+/* button animation properties */
+.ui-button {
+ -webkit-transition: all 0.25s ease-in-out;
+ -moz-transition: all 0.25s ease-in-out;
+ -o-transition: all 0.25s ease-in-out;
+}
+
/*states*/
.ui-button.ui-state-hover {
-moz-box-shadow: 0 0 8px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255,255,255,0.8) inset;
@@ -699,5 +706,33 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
*
* http://docs.jquery.com/UI/Progressbar#theming
*/
-.ui-progressbar { height: 12px; text-align: left; background: url(images/progress_bar.gif) 0 -14px repeat-x; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; background: url(images/progress_bar.gif) 0 0 repeat-x; }
+.ui-progressbar { height: 12px; text-align: left; background: #FFF url(images/progress_bar.gif) 0 -14px repeat-x; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; background: url(images/progress_bar.gif) 0 0 repeat-x; }
+
+/* Extra Input Field Styling */
+textarea, input:not([type="checkbox"]):not([type="radio"]):not([type="file"]) {
+ padding: 3px;
+ -webkit-border-radius: 2px;
+ -moz-border-radius: 2px;
+ border-radius: 2px;
+ border: 1px solid #cecece;
+ outline: none;
+ -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2);
+ -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2);
+ box-shadow: 0 1px 3px rgba(0,0,0,0.1) inset, 0 1px 0 rgba(255,255,255,0.2);
+ -webkit-transition: all 0.25s ease-in-out;
+ -moz-transition: all 0.25 ease-in-out;
+ -o-transition: all 0.25s ease-in-out;
+}
+textarea:hover, input:not([type="checkbox"]):not([type="radio"]):not([type="file"]):hover {
+ border: 1px solid #bdbdbd;
+ -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2);
+ -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2);
+ box-shadow: 0 1px 3px rgba(0,0,0,0.2) inset, 0 1px 0 rgba(255,255,255,0.2);
+}
+textarea:focus, input:not([type="checkbox"]):not([type="radio"]):not([type="file"]):focus {
+ border: 1px solid #95bdd4;
+ -webkit-box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2);
+ -moz-box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2);
+ box-shadow: 0 2px 3px rgba(161,202,226,0.5) inset, 0 1px 0 rgba(255,255,255,0.2);
+}
View
101 demo.html
@@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>jQuery UI Example Page</title>
<link type="text/css" href="css/Aristo/jquery-ui-1.8.7.custom.css" rel="stylesheet" />
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"></script>
- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.5/jquery-ui.min.js"></script>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.11/jquery-ui.min.js"></script>
<script type="text/javascript">
$(function(){
@@ -103,22 +103,24 @@
// Combinations
$('#tabs2').tabs();
$("#accordion2").accordion({ header: "h4" });
- $(".uibutton").button({
+ $("#buttonInModal").button({
icons: {primary: 'ui-icon-wrench'}
});
// Nested button tests
- $("#nestedButtonTest_1, #nestedButtonTest_2").button();
+ $("#nestedButtonTest_1, #nestedButtonTest_2, #buttonInModal").button().click(function(e) {
+ e.preventDefault();
+ });
});
</script>
<style type="text/css">
/*demo page css*/
- body{ font: 62.5% Cambria,Georgia,serif; margin: 50px;}
+ body{ font: 62.5% Cambria, Georgia, serif; margin: 50px;}
.demoHeaders { margin-top: 2em; }
- ul#icons {margin: 0; padding: 0;}
- ul#icons li {margin: 2px; position: relative; padding: 4px 0; cursor: pointer; float: left; list-style: none;}
- ul#icons span.ui-icon {float: left; margin: 0 4px;}
+ ul#icons { margin: 0; padding: 0;}
+ ul#icons li { margin: 2px; position: relative; padding: 4px 0; cursor: pointer; float: left; list-style: none; }
+ ul#icons span.ui-icon { float: left; margin: 0 4px; }
.columnbox { height: 170px; width: 48%; float:left; margin-right: 1%; }
#eq span { height: 120px; float: left; margin: 15px; }
#countries { width: 300px; }
@@ -244,7 +246,8 @@ <h2 class="demoHeaders">Modal Dialog</h2>
<!-- ui-dialog -->
<div id="dialog" title="Dialog Title">
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p><a href="#" class="uibutton">Change</a>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ <a href="#" id="buttonInModal" class="uibutton">Change</a>
</div>
<!-- Datepicker -->
@@ -492,40 +495,64 @@ <h2 class="demoHeaders">Overlay and Shadow Classes <em>(not currently used in UI
</div>
<h2 class="demoHeaders">Combination examples</h2>
- <div class="columnbox">
- <div id="tabs2">
- <ul>
- <li><a href="#tabs2-1">First</a></li>
- <li><a href="#tabs2-2">Second</a></li>
- <li><a href="#tabs2-3">Third</a></li>
- </ul>
- <div id="tabs2-1">
- <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse eget diam nec urna hendrerit tempus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum aliquam ligula non nulla cursus volutpat. Aliquam malesuada felis nec turpis auctor interdum. Cras et lobortis dolor. Nam sodales, dolor eu cursus faucibus, justo leo vestibulum turpis, id malesuada erat ipsum et leo. Integer id aliquam augue. Proin quis risus magna.</p>
- <a href="#" id="nestedButtonTest_1">Change</a>
- </div>
- <div id="tabs2-2">Tab 2</div>
- <div id="tabs2-3">Tab 3</div>
+ <div class="columnbox">
+ <div id="tabs2">
+ <ul>
+ <li><a href="#tabs2-1">First</a></li>
+ <li><a href="#tabs2-2">Second</a></li>
+ <li><a href="#tabs2-3">Third</a></li>
+ </ul>
+ <div id="tabs2-1">
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse eget diam nec urna hendrerit tempus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum aliquam ligula non nulla cursus volutpat. Aliquam malesuada felis nec turpis auctor interdum. Cras et lobortis dolor. Nam sodales, dolor eu cursus faucibus, justo leo vestibulum turpis, id malesuada erat ipsum et leo. Integer id aliquam augue. Proin quis risus magna.</p>
+ <a href="#" id="nestedButtonTest_1">Change</a>
</div>
+ <div id="tabs2-2">Tab 2</div>
+ <div id="tabs2-3">Tab 3</div>
</div>
- <div class="columnbox">
- <div id="accordion2">
- <div>
- <h4><a href="#">First</a></h4>
- <div>
- <p>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</p>
- <a href="#" id="nestedButtonTest_2">Change</a>
- </div>
- </div>
- <div>
- <h4><a href="#">Second</a></h4>
- <div>Phasellus mattis tincidunt nibh.</div>
- </div>
+ </div>
+ <div class="columnbox">
+ <div id="accordion2">
+ <div>
+ <h4><a href="#">First</a></h4>
<div>
- <h4><a href="#">Third</a></h4>
- <div>Mauris tempor urna non quam tincidunt aliquam. Proin venenatis metus eu purus interdum a vehicula ipsum sollicitudin. Mauris sed dignissim odio. Nam id odio sed diam dapibus dignissim. Nulla vestibulum nisl ac magna scelerisque adipiscing. Nam pellentesque sapien vulputate nisi scelerisque ut vehicula orci luctus. Sed rhoncus tempor metus vitae egestas. Proin pharetra tristique justo ac rutrum. Vestibulum ac pharetra dolor. Cras nibh arcu, bibendum eget luctus id, rhoncus nec augue. Integer ornare rhoncus nulla, eu aliquam mi ornare ullamcorper. Praesent egestas auctor orci, non rhoncus sapien eleifend at. Quisque eget purus sem, ut dignissim ligula. Etiam sollicitudin dui libero, id ullamcorper metus. </div>
+ <p>Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.</p>
+ <a href="#" id="nestedButtonTest_2">Change</a>
</div>
</div>
+ <div>
+ <h4><a href="#">Second</a></h4>
+ <div>Phasellus mattis tincidunt nibh.</div>
+ </div>
+ <div>
+ <h4><a href="#">Third</a></h4>
+ <div>Mauris tempor urna non quam tincidunt aliquam. Proin venenatis metus eu purus interdum a vehicula ipsum sollicitudin. Mauris sed dignissim odio. Nam id odio sed diam dapibus dignissim. Nulla vestibulum nisl ac magna scelerisque adipiscing. Nam pellentesque sapien vulputate nisi scelerisque ut vehicula orci luctus. Sed rhoncus tempor metus vitae egestas. Proin pharetra tristique justo ac rutrum. Vestibulum ac pharetra dolor. Cras nibh arcu, bibendum eget luctus id, rhoncus nec augue. Integer ornare rhoncus nulla, eu aliquam mi ornare ullamcorper. Praesent egestas auctor orci, non rhoncus sapien eleifend at. Quisque eget purus sem, ut dignissim ligula. Etiam sollicitudin dui libero, id ullamcorper metus. </div>
+ </div>
</div>
+ </div>
+
+ <div style="clear:both;">&nbsp;</div>
+
+ <h2 class="demoHeaders">Common Input Fields</h2>
+ <p>
+ <strong>Input (type: 'text')</strong><br />
+ <input type="text" />
+ </p>
+ <p>
+ <strong>Input (type: 'email' and 'password')</strong><br />
+ <input type="email" /><input type="password" />
+ </p>
+ <p>
+ <strong>Text Area</strong><br />
+ <textarea cols="30"></textarea>
+ </p>
+ <p>
+ <strong>Other Inputs Remain Fine</strong><br />
+ <input type="radio" /> <br />
+ <input type="checkbox" /> <br />
+ <input type="file" /> <br />
+ </p>
+
+
</body>
</html>
Please sign in to comment.
Something went wrong with that request. Please try again.