Skip to content

Button Re-write #1332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arschmitz wants to merge 28 commits into from
Closed

Button Re-write #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ebea476
Button: Inital commit of button refactor
arschmitz Jan 22, 2014
94eaa1f
button: pr update
arschmitz Aug 20, 2014
82ddb7a
Button: comment out test thats failing only in phantom
arschmitz Jul 16, 2014
fd4ed63
Button: Update disabled logic to simplify
arschmitz Aug 22, 2014
8b91839
Button: move button icon position classes out of core
arschmitz Aug 22, 2014
cb5bfb4
Button: Move all dom minipulation in _create into its own method
arschmitz Aug 22, 2014
84fa3ad
Button: remove outdated demos
arschmitz Aug 28, 2014
70c8d3b
Button: fix css broken from rebase
arschmitz Aug 28, 2014
792aa05
Dialog: Updating dialog and tests for new button API
arschmitz Mar 28, 2014
b785f83
Selectmenu: update to use button css
arschmitz Aug 22, 2014
36aa43a
Accordion: update to use button css
arschmitz Aug 22, 2014
4f1e2ba
Checkboxradio: inital commit of new widget
arschmitz Aug 28, 2014
a82ff60
Checkboxradio: Updates based on pr comments
arschmitz Aug 20, 2014
4f792bb
Checkboxradio: add visual focus outline to checkbox and radio buttons
arschmitz Jul 24, 2014
6dcea08
Checkboxradio: allow the parent of the input to be the label
arschmitz Jul 23, 2014
a736b22
Controlgroup: Inital commit of new widget
arschmitz Aug 23, 2014
c40020d
Button: fix css errors
arschmitz Aug 29, 2014
f676f07
Fixup: this commit needs to be split up it is html and css lint issues
arschmitz Sep 2, 2014
d04e1e7
Controlgroup: Updating last refrences from buttonset to controlgroup
arschmitz Sep 2, 2014
e25371f
Button: removing accidental important
arschmitz Sep 2, 2014
bfc5390
Button: remove deleted demos
arschmitz Sep 2, 2014
273b4b3
Checkboxradio: adding demos to main index page
arschmitz Sep 2, 2014
a535110
Controlgroup: adding demos to main index page
arschmitz Sep 2, 2014
dbb6b14
Checkboxradio: add demo index page
arschmitz Sep 2, 2014
136fc98
Controlgroup: add demo index page
arschmitz Sep 2, 2014
072aa42
Checkboxradio: Add to visual test index
arschmitz Sep 2, 2014
9097a5d
Checkboxradio: rename icon demo to icons
arschmitz Sep 2, 2014
0821e62
Controlgroup: toolbar demo does not need so much text update description
arschmitz Sep 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .csslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
"important": false,
"outline-none": false,
"overqualified-elements": false,
"text-indent": false
"text-indent": false,
"box-sizing": false
}
37 changes: 0 additions & 37 deletions demos/button/checkbox.html
View file
Open in desktop

This file was deleted.

16 changes: 12 additions & 4 deletions demos/button/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" href="../demos.css">
<script>
$(function() {
$( "input[type=submit], a, button" )
$( ".widget input[type=submit], .widget a, .widget button" )
.button()
.click(function( event ) {
event.preventDefault();
Expand All @@ -20,12 +20,20 @@
</script>
</head>
<body>
<div class="widget">
<h1>Widget Buttons</h1>
<button>A button element</button>

<button>A button element</button>
<input type="submit" value="A submit button">

<input type="submit" value="A submit button">
<a href="#">An anchor</a>
</div>
<h1>CSS Buttons</h1>
<button class="ui-button ui-widget ui-corner-all">A button element</button>

<input class="ui-button ui-widget ui-corner-all" type="submit" value="A submit button">

<a href="#">An anchor</a>
<a class="ui-button ui-widget ui-corner-all" href="#">An anchor</a>

<div class="demo-description">
<p>Examples of the markup that can be used for buttons: A button element, an input of type submit and an anchor.</p>
Expand Down
66 changes: 43 additions & 23 deletions demos/button/icons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,59 @@
<link rel="stylesheet" href="../demos.css">
<script>
$(function() {
$( "button:first" ).button({
icons: {
primary: "ui-icon-locked"
},
text: false
$( ".widget button, .widget a" ).first().button({
icon: "ui-icon-gear",
showLabel: false
}).next().button({
icons: {
primary: "ui-icon-locked"
}
icon: "ui-icon-triangle-1-w"
}).next().button({
icons: {
primary: "ui-icon-gear",
secondary: "ui-icon-triangle-1-s"
}
icon: "ui-icon-triangle-1-e",
iconPosition: "end"
}).next().button({
icons: {
primary: "ui-icon-gear",
secondary: "ui-icon-triangle-1-s"
},
text: false
icon: "ui-icon-triangle-1-s",
iconPosition: "bottom"
}).next().button({
icon: "ui-icon-triangle-1-n",
iconPosition: "top"
});
});
</script>
</head>
<body>

<button>Button with icon only</button>
<button>Button with icon on the left</button>
<button>Button with two icons</button>
<button>Button with two icons and no text</button>

<div class="demo-description">
<p>Some buttons with various combinations of text and icons.</p>
</div>
<div class="widget">
<h1>Widget</h1>
<a>Button with icon only</a>
<button>Button with icon on the left</button>
<button>Button with icon on the right</button>
<button>Button with icon on the bottom</button>
<button>Button with icon on the top</button>
</div>
<div class="css">
<h1>CSS</h1>
<button class="ui-button ui-widget ui-corner-all ui-button-icon-only" title="Button with icon only">
<span class="ui-icon ui-icon-gear"></span>
Button with icon only
</button>
<button class="ui-button ui-widget ui-corner-all ui-icon-beginning">
<span class="ui-icon ui-icon-triangle-1-w"></span>
Button with icon on the left
</button>
<button class="ui-button ui-widget ui-corner-all ui-icon-end">
<span class="ui-icon ui-icon-triangle-1-e"></span>
Button with icon on the right
</button>
<button class="ui-button ui-widget ui-corner-all ui-icon-bottom">
<span class="ui-icon ui-icon-triangle-1-s"></span>
Button with icon on bottom
</button>
<button class="ui-button ui-widget ui-corner-all ui-icon-top">
<span class="ui-icon ui-icon-triangle-1-n"></span>
Button with icon on top
</button>

</div>
</body>
</html>
4 changes: 0 additions & 4 deletions demos/button/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

<ul>
<li><a href="default.html">Default functionality</a></li>
<li><a href="radio.html">Radios</a></li>
<li><a href="checkbox.html">Checkboxes</a></li>
<li><a href="icons.html">Icons</a></li>
<li><a href="toolbar.html">Toolbar</a></li>
<li><a href="splitbutton.html">Split Button</a></li>
</ul>

</body>
Expand Down
32 changes: 0 additions & 32 deletions demos/button/radio.html
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions demos/button/splitbutton.html
View file
Open in desktop

This file was deleted.

118 changes: 0 additions & 118 deletions demos/button/toolbar.html
View file
Open in desktop

This file was deleted.

Loading