Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Wangaz committed Nov 3, 2015
2 parents 752f570 + b1d17d9 commit 7319520
Show file tree
Hide file tree
Showing 147 changed files with 2,875 additions and 2,575 deletions.
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"require": {
"laravel/framework": "5.1.*"
},
"provide": {
"semantic/ui-css": "2.1.5"
},
"autoload": {
"psr-4": {
"SUI\\": "src/"
Expand Down
4 changes: 4 additions & 0 deletions src/assets/semantic-ui/.versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
jquery@1.11.3_2
meteor@1.1.6
semantic:ui-css@2.0.7
underscore@1.0.3
Empty file modified src/assets/semantic-ui/LICENSE
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion src/assets/semantic-ui/README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CSS Distribution

This repository is automatically synced with the main [Semantic UI](https://github.com/Semantic-Org/Semantic-UI) repository to provide lightweight LESS only version of Semantic UI.
This repository is automatically synced with the main [Semantic UI](https://github.com/Semantic-Org/Semantic-UI) repository to provide lightweight CSS only version of Semantic UI.

This package **does not support theming** and includes generated CSS files of the default theme only.

Expand Down
4 changes: 2 additions & 2 deletions src/assets/semantic-ui/components/accordion.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.1.4 - Accordion
* # Semantic UI 2.1.5 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -129,7 +129,7 @@
.ui.styled.accordion,
.ui.styled.accordion .accordion {
border-radius: 0.28571429rem;
background: #ffffff;
background: #FFFFFF;
box-shadow: 0px 1px 2px 0 rgba(34, 36, 38, 0.15), 0px 0px 0px 1px rgba(34, 36, 38, 0.15);
}
.ui.styled.accordion .title,
Expand Down
4 changes: 2 additions & 2 deletions src/assets/semantic-ui/components/accordion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* # Semantic UI 2.1.4 - Accordion
* # Semantic UI 2.1.5 - Accordion
* http://github.com/semantic-org/semantic-ui/
*
*
Expand Down Expand Up @@ -592,5 +592,5 @@ $.extend( $.easing, {
}
});

})( jQuery, window , document );
})( jQuery, window, document );

4 changes: 2 additions & 2 deletions src/assets/semantic-ui/components/accordion.min.css

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

Loading

0 comments on commit 7319520

Please sign in to comment.