Skip to content
This repository has been archived by the owner on May 16, 2021. It is now read-only.

Commit

Permalink
Rearranged all the assets in the package + Added Gulp support via Lar…
Browse files Browse the repository at this point in the history
…avel-Elixir + Added Docker support (/dev folder) #426.
  • Loading branch information
shehi committed Jul 3, 2016
1 parent a613cbb commit c38d1f7
Show file tree
Hide file tree
Showing 79 changed files with 773 additions and 6,341 deletions.
19 changes: 0 additions & 19 deletions .gitignore
@@ -1,23 +1,4 @@
.*
!.git*
*.swp
*~
/node_modules
/bower_components

# Do not ignore these generated files. This way, the GitHub generated
# archives will automatically still contain the minified version
# jquery.uniform.min.js
# themes/*/css/uniform.*.min.css

# These files are created with bin/build
theme-kit/README.html
www/downloads/theme-kit.zip
www/downloads/uniform.*.theme.zip
www/images/bg-input*.png
www/images/sprite*.png
www/index.html
www/javascripts/jquery.uniform.js
www/javascripts/jquery.uniform.min.js
www/javascripts/themecss.js
www/stylesheets/uniform.*.css
2 changes: 1 addition & 1 deletion CREDITS.md
Expand Up @@ -4,4 +4,4 @@ Much thanks to Thomas Reynolds and Buck Wilson for their help and advice on this

Disabling text selection is made possible by Mathias Bynens <http://mathiasbynens.be/> and his noSelect plugin, <https://github.com/mathiasbynens/jquery-noselect>, which is embedded.

Tyler Akins (@fidien) has also rewritten chunks of the plugin, helped close many issues, and ensured version 2 got out the door.
Tyler Akins (@fidian) has also rewritten chunks of the plugin, helped close many issues, and ensured version 2 got out the door.
88 changes: 0 additions & 88 deletions Makefile

This file was deleted.

34 changes: 27 additions & 7 deletions README.md
@@ -1,4 +1,4 @@
# Uniform
# (jQuery) Uniform

> A jQuery plugin to make your form controls look how you want them to. Now with HTML-5 attributes!
Expand All @@ -10,6 +10,8 @@ Works well with jQuery 1.6+, but we've received patches and heard that this work

## Installation

Packaging of Uniform comes with source SASS files and minified CSS files, ready for consumption in live/production environment. You can install Uniform via one of two methods listed below:

### Via NPM

Simply run:
Expand All @@ -25,18 +27,36 @@ Minified source file will be built inside ```dist/``` folder.
### Via Bower

bower install --save jquery.uniform

### Un-minified CSS files

For your own development purposes, to get human-readable, un-minified CSS outputs, you will need to install Uniform via NPM (as shown above), install the necessary dependencies through ```npm install``` and then run ```gulp```. Doing so will recreate readable CSS files in ```dist/css``` folder. Invoking ```gulp --production``` however, will recreate minified CSS files (which is default behavior, what we already have in the ```dist``` folder).


## Implementation

Stylesheets and Javascript files should be linked in the ```<header>``` of your markup. Javascript files should be linked/included after jQuery:
There are two ways to go with this:

### Basic Implementation

Basically, you can use the final assets provided in ```dist``` folder out of the box.

Stylesheets and Javascript files should be linked in the ```<header>``` of your markup (the latter, coming after jQuery):

<!-- Make sure your CSS file is listed before Javascript sources -->
<link rel="stylesheet" href="/path-to-my-assets/uniform/dist/css/default.css" media="screen">
<script src="/path-to-my-assets/jquery/dist/jquery.min.js"></script>
<script src="/path-to-my-assets/uniform/dist/js/jquery.uniform.standalone.js"></script>

Or if you are using our bundled version - ```jquery.uniform.bundled.js``` file - which already comes with jQuery (beware not to include jQuery twice):

<!-- Make sure your CSS file is listed before Javascript sources -->
<link rel="stylesheet" href="/path-to-my-assets/uniform/dist/css/default.css" media="screen">
<script src="/path-to-my-assets/uniform/dist/js/jquery.uniform.bundled.js"></script>

<!-- Make sure your CSS file is listed before jQuery -->
<link rel="stylesheet" href="uniform.default.css" media="screen">
<script src="jquery.min.js"></script>
<script src="jquery.uniform.js"></script>
### Advanced Implementation

This relies upon a copy of jquery.uniform.js, uniform.default.css and the various images all being available on your webserver.
To have more control over your web assets, you can directly work with our SCSS and JS files, by importing them into or bundling with your own assets. Please be advised that our Gulp configuration (via Laravel-Elixir package) includes Auto-prefixer, i.e. browser prefixes are automatically added to CSS during the post-processing of SCSS files. Whatever your post-processing solution will be (Gulp-based or Compass), you need to make sure to include Auto-prefixer in that workflow. Our SCSS source files do not include browser prefixes out of the box!


## Usage
Expand Down
8 changes: 4 additions & 4 deletions TODO.md
@@ -1,4 +1,4 @@
* Enhance demo page to show all sorts of edge cases, like when bugs were found. shidec has IE7 fixes with uniformed 'a' elements, which might be needed if they are still broken.
* Add tests. szaboat added Jasmine tests. May wish to be more thorough? Not browser based?
* IE8 issue when file button was moved to the left side? See https://github.com/kamilogorek/uniform/commit/d71e77f997e033e69fe0070f06428f8318cd9324
* See if selects of various heights work in webkit https://github.com/AdrianGyuricska/uniform/commit/1fca129d7de2e5812f172f6f7b96a9df7c55a063
- [ ] Enhance demo page to show all sorts of edge cases, like when bugs were found. shidec has IE7 fixes with uniformed 'a' elements, which might be needed if they are still broken.
- [ ] Add tests. szaboat added Jasmine tests. May wish to be more thorough? Not browser based?
- [ ] IE8 issue when file button was moved to the left side? See https://github.com/kamilogorek/uniform/commit/d71e77f997e033e69fe0070f06428f8318cd9324
- [ ] See if selects of various heights work in webkit https://github.com/AdrianGyuricska/uniform/commit/1fca129d7de2e5812f172f6f7b96a9df7c55a063
12 changes: 5 additions & 7 deletions bower.json
Expand Up @@ -3,7 +3,7 @@
"description": "A jQuery plugin to make your form controls look how you want them to. Now with HTML-5 attributes!",
"homepage": "http://opensource.audith.org/uniform",
"main": [
"lib/jquery.uniform.js"
"dist/js/jquery.uniform.standalone.js"
],
"dependencies": {
"jquery": "^1.6"
Expand All @@ -12,9 +12,9 @@
"globals"
],
"keywords": [
"motion",
"physics",
"particles"
"custom form controls",
"uniform",
"jquery"
],
"authors": [
"Shahriyar Imanov <shehi@imanov.me>",
Expand All @@ -29,8 +29,6 @@
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"www",
"www-fragments"
"bower_components"
]
}
23 changes: 23 additions & 0 deletions dev/build.sh
@@ -0,0 +1,23 @@
#!/usr/bin/env bash

docker build -f dev/docker/scripts/builder/Dockerfile -t audithsoftworks/uniform .

#docker-compose -f docker-compose.yml pull;
#docker-compose -f docker-compose.yml up -d;
#docker-compose -f docker-compose.yml ps;

#docker exec uniform_builder_1 /bin/bash -c "echo $(docker inspect -f '{{ .NetworkSettings.IPAddress }}' basis_nginx_1) basis.audith.org | tee -a /etc/hosts";

#test -f .env || cat .env.example | sed s/DB_HOST=.*/DB_HOST=mysql56/g | sed s/DB_USERNAME=.*/DB=mysql/g | sed s/DB_PASSWORD=.*//g | tee .env;

docker exec uniform_builder_1 /bin/bash -c "
npm install;
gulp;
";

#docker-compose -f docker-compose.yml stop;

#sleep 10;

#docker rm $(docker ps -a | grep "Exited" | awk "{print \$1}")
#docker rmi $(docker images | grep "<none>" | awk "{print \$3}");
51 changes: 51 additions & 0 deletions dev/docker/scripts/builder/Dockerfile
@@ -0,0 +1,51 @@
FROM ubuntu:xenial
MAINTAINER Shahriyar Imanov <shehi@imanov.me>

WORKDIR /home/audith

ENV DEBIAN_FRONTEND noninteractive

# Install dependencies
RUN apt-get update -y && apt-get install -y apt-utils && apt-get upgrade -y
RUN apt-get install -y \
build-essential \
bzip2 \
curl \
ruby \
ruby-dev \
&& apt-get clean \
&& apt-get autoremove -y

# Install Compass dependencies
RUN gem install compass sass sass-globbing autoprefixer-rails fontcustom

# Install Node
RUN set -ex \
&& for key in \
9554F04D7259F04124DE6B476D5A82AC7E37093B \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
FD3A5288F042B6850C66B31F09FE44734EB7990E \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
; do \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
done

ENV NPM_CONFIG_LOGLEVEL info
ENV NODE_VERSION 6.2.2

RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \
&& rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
&& npm install -g npm@latest \
&& npm cache clear \
&& rm -rf /tmp/npm-*

# Install Node global dependencies
RUN npm install -g bower gulp grunt-cli
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
Empty file removed dist/.gitkeep
Empty file.
1 change: 1 addition & 0 deletions dist/css/agent.css

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

0 comments on commit c38d1f7

Please sign in to comment.