Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Commit

Permalink
Merge pull request #64 from snap-cloud/css2
Browse files Browse the repository at this point in the history
CSS Retry

Make it so that more assets are served from bower.
  • Loading branch information
cycomachead committed May 2, 2015
2 parents 6f5cdcc + ea09a52 commit 4058fef
Show file tree
Hide file tree
Showing 207 changed files with 9,498 additions and 11 deletions.
12 changes: 7 additions & 5 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope.
*
*= require_self
*= require main
*/

= require_tree pure
= require pure/forms
= require_self
/*
*= require pure/pure-min
*= require pure/grids-responsive-min
*= require icono/dist/icono.min
*= require main
*= require_self
*/
6 changes: 2 additions & 4 deletions app/views/projects/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<% content_for :head do %>
<% stylesheet_link_tag "project_listing" %>
<link rel="stylesheet" href="http://saeedalipoor.github.io/icono/icono.min.css">
<!-- <% stylesheet_link_tag "icono/dist/icono.min" %> -->
<% end %>

<link rel="stylesheet" href="http://saeedalipoor.github.io/icono/icono.min.css">
<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.6.0/grids-responsive-min.css">

<!-- <div class="pure-g"> -->

<div class="pure-u-1-8 project-title-bar" style="display: table-cell; vertical-align: middlle;">
<div class="centered-label-darkgray" style="background: #EEBA4C; width: 70%; height: 40%; margin: auto; padding: 10px; position: relative; border-radius: 5px; text-align: center; top: -50%;">
<%= @project.is_public ? "Public Project" : "Private Project"%>
<%= @project.is_public ? "Public Project" : "Private Project" %>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/users/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<tbody>
<tr> <% @projects.each do |project| %>
<td> <a href="../projects/<%=project.id%>"><%= project.title %> </a>
<br> &nbsp;&nbsp;&nbsp;&nbsp; <%= project.notes %></td>
<br> &nbsp;&nbsp;&nbsp;&nbsp; <%= project.notes %></td>
<td> <%= project.is_public ? "Public": "Private"%></td>
<td> <%= project.created_at %></td>
<td> <%= project.updated_at %></td>
Expand Down
4 changes: 3 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"private": true,
"dependencies": {
"jquery": "~2.1.3",
"pure": "~0.6.0"
"pure": "~0.6.0",
"icono": "~1.3.0",
"jquery-ujs": "~1.0.3"
}
}
18 changes: 18 additions & 0 deletions vendor/bower/icono/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "icono",
"main": "icono.min.css",
"ignore": [],
"private": false,
"homepage": "https://github.com/saeedalipoor/icono",
"version": "1.3.0",
"_release": "1.3.0",
"_resolution": {
"type": "version",
"tag": "v1.3.0",
"commit": "f6883d2af504f40b35117e30ecaf6f949380b018"
},
"_source": "git://github.com/saeedalipoor/icono.git",
"_target": "~1.3.0",
"_originalSource": "icono",
"_direct": true
}
46 changes: 46 additions & 0 deletions vendor/bower/icono/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
*.pyc
*.pyo
*.obj
*.a
*.lib
*.dylib
*.ncb
*.sdf
*.suo
*.pdb
*.idb
*.psd
*.db
*.sublime-workspace
*.sublime-project
*.com
*.class
*.dll
*.exe
*.o
*.so
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.log
*.sql
*.sqlite
*.cfg

.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes

.editorconfig

ehthumbs.db
Thumbs.db

node_modules/
21 changes: 21 additions & 0 deletions vendor/bower/icono/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014-2015 Saeed Alipoor

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
195 changes: 195 additions & 0 deletions vendor/bower/icono/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
#icono

**icono** is an icon pack that needs no external resources. Every tags can be an icon made with **pure CSS**.

[Demo][2]

##How to use

To get going with icono you can:

* Download [icono.min.css][1]
or
* Install it with [Bower](http://bower.io):
```
$ bower install icono
```
or
* Install it with [npm](https://www.npmjs.com):
```
$ npm install icono
```

And then load it in your page:
```
<link rel="stylesheet" href="icono.min.css">
```

or

You can add icono folder in your project and import icono.less for compile. iconos maincolor can be changed in **variable.less**.

and then

just add iconos classes to any type of elements that support psuedo-element.

####Example:
`<i class="icono-mail"></i>`

`<div class="icono-mail"></div>`

`<span class="icono-mail"></span>`

`<whatever class="icono-mail"></whatever>`

Also you can change color of icons as simple as set color for an element.

####Example:
`i.heart{color: red;}`


##Available classes
* `icono-home`
* `icono-mail`
* `icono-rss`
* `icono-hamburger`
* `icono-plus`
* `icono-cross`
* `icono-check`
* `icono-power`
* `icono-heart`
* `icono-infinity`
* `icono-flag`
* `icono-file`
* `icono-image`
* `icono-video`
* `icono-music`
* `icono-headphone`
* `icono-document`
* `icono-folder`
* `icono-pin`
* `icono-smile`
* `icono-eye`
* `icono-sliders`
* `icono-share`
* `icono-sync`
* `icono-reset`
* `icono-gear`
* `icono-signIn`
* `icono-signOut`
* `icono-support`
* `icono-dropper`
* `icono-tiles`
* `icono-list`
* `icono-chain`
* `icono-youtube`
* `icono-rename`
* `icono-search`
* `icono-book`
* `icono-forbidden`
* `icono-trash`
* `icono-keyboard`
* `icono-mouse`
* `icono-user`
* `icono-crop`
* `icono-display`
* `icono-imac`
* `icono-iphone`
* `icono-macbook`
* `icono-imacBold`
* `icono-iphoneBold`
* `icono-macbookBold`
* `icono-nexus`
* `icono-microphone`
* `icono-asterisk`
* `icono-terminal`
* `icono-paperClip`
* `icono-market`
* `icono-clock`
* `icono-textAlignRight`
* `icono-textAlignCenter`
* `icono-textAlignLeft`
* `icono-indent`
* `icono-outdent`
* `icono-frown`
* `icono-meh`
* `icono-locationArrow`
* `icono-plusCircle`
* `icono-checkCircle`
* `icono-crossCircle`
* `icono-exclamation`
* `icono-exclamationCircle`
* `icono-comment`
* `icono-commentEmpty`
* `icono-areaChart`
* `icono-pieChart`
* `icono-barChart`
* `icono-bookmark`
* `icono-bookmarkEmpty`
* `icono-filter`
* `icono-volume`
* `icono-volumeLow`
* `icono-volumeMedium`
* `icono-volumeHigh`
* `icono-volumeDecrease`
* `icono-volumeIncrease`
* `icono-volumeMute`
* `icono-tag`
* `icono-calendar`
* `icono-camera`
* `icono-piano`
* `icono-ruler`
* `icono-cup`
* `icono-creditCard`
* `icono-facebook`
* `icono-twitter`
* `icono-gplus`
* `icono-linkedIn`
* `icono-instagram`
* `icono-flickr`
* `icono-delicious`
* `icono-codepen`
* `icono-blogger`
* `icono-play`
* `icono-pause`
* `icono-stop`
* `icono-rewind`
* `icono-forward`
* `icono-next`
* `icono-previous`
* `icono-caretRight`
* `icono-caretLeft`
* `icono-caretUp`
* `icono-caretDown`
* `icono-rightArrow`
* `icono-leftArrow`
* `icono-upArrow`
* `icono-downArrow`
* `icono-sun`
* `icono-moon`
* `icono-disqus`
* `icono-cart`
* `icono-caretRightCircle`
* `icono-caretLeftCircle`
* `icono-caretUpCircle`
* `icono-caretDownCircle`
* `icono-caretRightSquare`
* `icono-caretLeftSquare`
* `icono-caretUpSquare`
* `icono-caretDownSquare`
* `icono-dribbble`
* `icono-sitemap`


##Development & Contributing

Using npm install the dependencies:

$ npm install

Run Gulp

$ gulp

[1]:http://saeedalipoor.github.io/icono/icono.min.css
[2]:http://saeedalipoor.github.io/icono
7 changes: 7 additions & 0 deletions vendor/bower/icono/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "icono",
"main": "icono.min.css",
"ignore": [
],
"private": false
}
Loading

0 comments on commit 4058fef

Please sign in to comment.