Skip to content
This repository was archived by the owner on Oct 8, 2021. It is now read-only.

Button and Icons - CSS and Demos #7753

Closed
wants to merge 13 commits into from
Closed

Button and Icons - CSS and Demos #7753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
983e9d1
Widgets: begin updating to ui widgets for 1.5
arschmitz Sep 18, 2014
180174a
Button: Remove console.log()
Sep 19, 2014
fffdb18
Table: Update columntoggle dependency
Sep 19, 2014
9edac0d
All: Replace btn by button
jaspermdegroot Oct 1, 2014
7d60151
Icons: Use span instead of pseudo element
jaspermdegroot Sep 11, 2014
31f3dd7
Demos: Updated custom CSS to spans for icons
jaspermdegroot Oct 9, 2014
be6f46c
Demos: Use spans for icons in quick links
jaspermdegroot Oct 9, 2014
ef97a23
Demos: Updated buttons to spans for icons
jaspermdegroot Oct 9, 2014
e7864b3
Core: Correct margin for icons in buttons with left/right position class
jaspermdegroot Oct 9, 2014
bdb928d
Button: Fixed the initSelector
jaspermdegroot Oct 10, 2014
6c4c850
Button: All button CSS in core.css
jaspermdegroot Oct 10, 2014
fa7c823
Controlgroup: Removed the old jQuery Mobile controlgroup widget
jaspermdegroot Oct 11, 2014
80f1912
All: Renamed icon position classes
jaspermdegroot Oct 11, 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
11 changes: 7 additions & 4 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,10 +1014,13 @@ module.exports = function( grunt ) {
}
},
files: {
"jquery-ui/jquery.ui.core.js": "jquery-ui/ui/jquery.ui.core.js",
"jquery-ui/jquery.ui.widget.js": "jquery-ui/ui/jquery.ui.widget.js",
"jquery-ui/jquery.ui.tabs.js": "jquery-ui/ui/jquery.ui.tabs.js",
"jquery-ui/MIT-LICENSE.txt": "jquery-ui/MIT-LICENSE.txt"
"jquery-ui/core.js": "jquery-ui/ui/core.js",
"jquery-ui/widget.js": "jquery-ui/ui/widget.js",
"jquery-ui/tabs.js": "jquery-ui/ui/tabs.js",
"jquery-ui/button.js": "jquery-ui/ui/button.js",
"jquery-ui/checkboxradio.js": "jquery-ui/ui/checkboxradio.js",
"jquery-ui/controlgroup.js": "jquery-ui/ui/controlgroup.js",
"jquery-ui/LICENSE.txt": "jquery-ui/LICENSE.txt"
}
},
},
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"dependencies": {
"jquery": "1.11.1",
"jquery-ui": "jquery/jquery-ui#c0ab71056b936627e8a7821f03c044aec6280a40"
"jquery-ui": "jquery/jquery-ui#button"
},
"devDependencies": {
"requirejs": "2.1.2",
Expand Down
14 changes: 7 additions & 7 deletions css/structure/jquery.mobile.collapsible.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
padding: 0;
position: relative;
}
.ui-collapsible-heading .ui-btn {
.ui-collapsible-heading .ui-button {
text-align: left;
margin: 0;
border-left-width: 0;
border-right-width: 0;
}
.ui-collapsible-heading .ui-btn-icon-top,
.ui-collapsible-heading .ui-btn-icon-bottom {
.ui-collapsible-heading .ui-icon-top,
.ui-collapsible-heading .ui-icon-bottom {
text-align: center;
}
.ui-collapsible-inset .ui-collapsible-heading .ui-btn {
.ui-collapsible-inset .ui-collapsible-heading .ui-button {
border-right-width: 1px;
border-left-width: 1px;
}
.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) > .ui-collapsible-heading .ui-btn {
.ui-collapsible-collapsed + .ui-collapsible:not(.ui-collapsible-inset) > .ui-collapsible-heading .ui-button {
border-top-width: 0;
}
.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-btn {
.ui-collapsible-set .ui-collapsible:not(.ui-collapsible-inset) .ui-collapsible-heading .ui-button {
border-top-width: 1px;
}
.ui-collapsible-heading-status {
Expand Down Expand Up @@ -65,7 +65,7 @@
border-radius: 0;
}
.ui-collapsible-heading,
.ui-collapsible-heading > .ui-btn {
.ui-collapsible-heading > .ui-button {
-webkit-border-radius: inherit;
border-radius: inherit;
}
Expand Down
44 changes: 22 additions & 22 deletions css/structure/jquery.mobile.controlgroup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ fieldset.ui-controlgroup {
.ui-mini .ui-controlgroup-label {
font-size: 16px;
}
.ui-controlgroup.ui-mini .ui-btn-icon-notext,
.ui-controlgroup .ui-mini.ui-btn-icon-notext {
.ui-controlgroup.ui-mini .ui-button-icon-only,
.ui-controlgroup .ui-mini.ui-button-icon-only {
font-size: inherit;
}
.ui-controlgroup-controls .ui-btn,
.ui-controlgroup-controls .ui-button,
.ui-controlgroup-controls .ui-checkbox,
.ui-controlgroup-controls .ui-radio,
.ui-controlgroup-controls .ui-select {
margin: 0;
}
.ui-controlgroup-controls .ui-btn:focus,
.ui-controlgroup-controls .ui-btn.ui-focus {
.ui-controlgroup-controls .ui-button:focus,
.ui-controlgroup-controls .ui-button.ui-focus {
z-index: 1;
}
.ui-controlgroup-controls li {
Expand All @@ -39,40 +39,40 @@ fieldset.ui-controlgroup {
.ui-controlgroup-horizontal .ui-controlgroup-controls:after {
clear: both;
}
.ui-controlgroup-horizontal .ui-controlgroup-controls > .ui-btn,
.ui-controlgroup-horizontal .ui-controlgroup-controls li > .ui-btn,
.ui-controlgroup-horizontal .ui-controlgroup-controls > .ui-button,
.ui-controlgroup-horizontal .ui-controlgroup-controls li > .ui-button,
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-checkbox,
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-radio,
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-select {
float: left;
clear: none;
}
.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-btn,
.ui-controlgroup-controls .ui-btn-icon-notext {
.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-button,
.ui-controlgroup-controls .ui-button-icon-only {
width: auto;
}
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-btn-icon-notext,
.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-btn-icon-notext {
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-button-icon-only,
.ui-controlgroup-horizontal .ui-controlgroup-controls button.ui-button-icon-only {
width: 1.5em;
}
.ui-controlgroup-controls .ui-btn-icon-notext {
.ui-controlgroup-controls .ui-button-icon-only {
height: auto;
padding: .7em 1em;
}
.ui-controlgroup-vertical .ui-controlgroup-controls .ui-btn {
.ui-controlgroup-vertical .ui-controlgroup-controls .ui-button {
border-bottom-width: 0;
}
.ui-controlgroup-vertical .ui-controlgroup-controls .ui-btn.ui-last-child {
.ui-controlgroup-vertical .ui-controlgroup-controls .ui-button.ui-last-child {
border-bottom-width: 1px;
}
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-btn {
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-button {
border-right-width: 0;
}
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-btn.ui-last-child {
.ui-controlgroup-horizontal .ui-controlgroup-controls .ui-button.ui-last-child {
border-right-width: 1px;
}
.ui-controlgroup-controls .ui-btn-corner-all,
.ui-controlgroup-controls .ui-btn.ui-corner-all {
.ui-controlgroup-controls .ui-button-corner-all,
.ui-controlgroup-controls .ui-button.ui-corner-all {
-webkit-border-radius: 0;
border-radius: 0;
}
Expand All @@ -84,25 +84,25 @@ fieldset.ui-controlgroup {
-webkit-border-radius: inherit;
border-radius: inherit;
}
.ui-controlgroup-vertical .ui-btn.ui-first-child {
.ui-controlgroup-vertical .ui-button.ui-first-child {
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
}
.ui-controlgroup-vertical .ui-btn.ui-last-child {
.ui-controlgroup-vertical .ui-button.ui-last-child {
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: inherit;
border-bottom-right-radius: inherit;
}
.ui-controlgroup-horizontal .ui-btn.ui-first-child {
.ui-controlgroup-horizontal .ui-button.ui-first-child {
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
}
.ui-controlgroup-horizontal .ui-btn.ui-last-child {
.ui-controlgroup-horizontal .ui-button.ui-last-child {
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-bottom-right-radius: inherit;
Expand Down
Loading