Skip to content

Commit

Permalink
Merge branch 'master' into feature/integrate-uikit
Browse files Browse the repository at this point in the history
  • Loading branch information
@dengenxp
dengenxp committed Apr 13, 2016
2 parents 377db02 + acd91d0 commit 5e438cd
Show file tree
Hide file tree
Showing 346 changed files with 9,634 additions and 801 deletions.
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/accordion.almost-flat.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Accordion
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/accordion.almost-flat.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/accordion.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Accordion
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/accordion.gradient.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Accordion
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/accordion.gradient.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/accordion.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion public_html/vendor/uikit/css/components/autocomplete.almost-flat.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Autocomplete
========================================================================== */
Expand All @@ -18,6 +18,11 @@
/* 4 */
vertical-align: middle;
}
/* Legacy dropdown modifier */
.uk-dropdown-flip {
left: auto;
right: 0;
}
/* Nav modifier `uk-nav-autocomplete`
========================================================================== */
/*
Expand Down
4 changes: 2 additions & 2 deletions public_html/vendor/uikit/css/components/autocomplete.almost-flat.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion public_html/vendor/uikit/css/components/autocomplete.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Autocomplete
========================================================================== */
Expand All @@ -18,6 +18,11 @@
/* 4 */
vertical-align: middle;
}
/* Legacy dropdown modifier */
.uk-dropdown-flip {
left: auto;
right: 0;
}
/* Nav modifier `uk-nav-autocomplete`
========================================================================== */
/*
Expand Down
7 changes: 6 additions & 1 deletion public_html/vendor/uikit/css/components/autocomplete.gradient.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Autocomplete
========================================================================== */
Expand All @@ -18,6 +18,11 @@
/* 4 */
vertical-align: middle;
}
/* Legacy dropdown modifier */
.uk-dropdown-flip {
left: auto;
right: 0;
}
/* Nav modifier `uk-nav-autocomplete`
========================================================================== */
/*
Expand Down
4 changes: 2 additions & 2 deletions public_html/vendor/uikit/css/components/autocomplete.gradient.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions public_html/vendor/uikit/css/components/autocomplete.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/datepicker.almost-flat.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Datepicker
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/datepicker.almost-flat.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/datepicker.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Datepicker
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/datepicker.gradient.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Datepicker
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/datepicker.gradient.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/datepicker.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/dotnav.almost-flat.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Dotnav
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/dotnav.almost-flat.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/dotnav.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Dotnav
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/dotnav.gradient.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Dotnav
========================================================================== */
Expand Down
2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/dotnav.gradient.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/dotnav.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public_html/vendor/uikit/css/components/form-advanced.almost-flat.css
View file
@@ -1,4 +1,4 @@
/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/*! UIkit 2.26.2 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
/* ========================================================================
Component: Form advanced
Note: Only works in Webkit at the moment
Expand Down

0 comments on commit 5e438cd

Please sign in to comment.