Navigation Menu

Skip to content

Commit

Permalink
Fix dist versions to remove merge conflicts, fix immediate build on c…
Browse files Browse the repository at this point in the history
…onfig
  • Loading branch information
jlukic committed Oct 20, 2014
1 parent e070a71 commit d2dd222
Show file tree
Hide file tree
Showing 45 changed files with 108 additions and 1,411 deletions.
16 changes: 0 additions & 16 deletions dist/components/accordion.min.css

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

16 changes: 0 additions & 16 deletions dist/components/breadcrumb.min.css
@@ -1,18 +1,3 @@
<<<<<<< HEAD:build/minified/definitions/collections/breadcrumb.min.css
/*
* # Semantic UI
* Version: 0.16.1
* http://github.com/jlukic/semantic-ui
*
*
* Copyright 2014 Contributors
* Released under the MIT license
* http://opensource.org/licenses/MIT
*
* Released: 10/15/2014
*/

=======
/*
* # Semantic UI
* git://github.com/Semantic-Org/Semantic-UI.git
Expand All @@ -23,5 +8,4 @@
* http://opensource.org/licenses/MIT
*
*/
>>>>>>> c10dce7d125ca211a6d757550cf416d10381ff44:dist/components/breadcrumb.min.css
.ui.breadcrumb{margin:1em 0;display:inline-block;vertical-align:middle}.ui.breadcrumb:first-child{margin-top:0}.ui.breadcrumb:last-child{margin-bottom:0}.ui.breadcrumb .divider{display:inline-block;opacity:.5;margin:0 .2rem;font-size:.9em;color:rgba(0,0,0,.4);vertical-align:baseline}.ui.breadcrumb a{color:#009fda}.ui.breadcrumb a:hover{color:#00b2f3}.ui.breadcrumb .icon.divider{font-size:.7em;vertical-align:middle}.ui.breadcrumb a.section{cursor:pointer}.ui.breadcrumb .section{display:inline-block;margin:0;padding:0}.ui.breadcrumb.segment{display:inline-block;padding:.5em 1em}.ui.breadcrumb .active.section{font-weight:700}.ui.mini.breadcrumb{font-size:.65em}.ui.tiny.breadcrumb{font-size:.7em}.ui.small.breadcrumb{font-size:.75em}.ui.breadcrumb{font-size:1em}.ui.large.breadcrumb{font-size:1.1em}.ui.big.breadcrumb{font-size:1.05em}.ui.huge.breadcrumb{font-size:1.3em}.ui.massive.breadcrumb{font-size:1.5em}
16 changes: 0 additions & 16 deletions dist/components/button.min.css

Large diffs are not rendered by default.

16 changes: 0 additions & 16 deletions dist/components/card.min.css

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

0 comments on commit d2dd222

Please sign in to comment.