Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jbutko committed Jan 7, 2017
1 parent 6616a64 commit 0099f0e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 37 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 Jozef Butko
Copyright (c) 2017 Jozef Butko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Do not waste your valuable time when you are starting with new project by config

*Client* [documentation](https://github.com/jbutko/ExpressJS-Socket.IO-AngularJS-Boilerplate/blob/master/client/README.md)
* Component oriented AngularJS client app built on version 1.6.x
* Token based user authetification (Auth component and Auth interceptor)
* Routes for user signup,change user password, user list and update user
* SASS preprocessor with bootstrap grid system
* Gulp with browser-sync for serving app including tasks for SASS files compilation, JShint linting or build task for generating minified production version
* UI-Router for seamless AngularJS routing
Expand Down
2 changes: 1 addition & 1 deletion client/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<!-- build:libs js/libs.js -->
<!-- endbuild -->

<!-- <script src="https://cdn.socket.io/socket.io-1.4.5.js"></script> -->
<!-- replace localhost:5000 based URL where API app will be deployed -->
<script src="http://localhost:5000/socket.io/socket.io.js"></script>

<!-- Angular external libraries for application -->
Expand Down
37 changes: 3 additions & 34 deletions client/styles/partials/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ Typography
=============================== */

$font: "Open Sans", Helvetica, Arial, sans-serif;
$fontTitles: "Open Sans", Helvetica, Arial, sans-serif;
$font-italic: Cambria, Times New Roman, Times, serif;
$font-bold: Helvetica, Arial, sans-serif;
$font-semibold: Helvetica, Arial, sans-serif;
$font-extrabold: Helvetica, Arial, sans-serif;
$font-extralightitalic: Helvetica, Arial, sans-serif;


/* ===============================
H1, H2, H3, H4, H5 STYLES
Expand All @@ -25,7 +18,7 @@ h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5 {
text-rendering: optimizelegibility;
font-weight: bold;
display: block;
font-family: $fontTitles;
font-family: $font;

a {
text-decoration: none;
Expand Down Expand Up @@ -59,44 +52,20 @@ h5, .h5 {
font-weight: 700;
}


/* ===============================
sizes
=============================== */

$large: 28px;
$medium: 20px;
$small: 14px;

/* ===============================
weights
=============================== */

$thin: 300;
$normal: 400;
$semi-bold: 600;
$bold: 700;
$extra-bold: 900;

/*
some nice typographical defaults
more here: http://www.newnet-soft.com/blog/csstypography
*/
p {
-ms-word-wrap: break-word;
word-break: break-word; //non-standart css for webkit
word-wrap: break-word;
// cleaning up the ragged lines and breaks
-webkit-hyphens: auto;
-moz-hyphens: auto;
hyphens: auto;
// sets a minimum number of characters before and after the break
-webkit-hyphenate-before: 2;
-webkit-hyphenate-after: 3;
hyphenate-lines: 3;
// enabling fancy ligatures when available
-webkit-font-feature-settings: "liga", "dlig";
-moz-font-feature-settings: "liga=1, dlig=1";
-ms-font-feature-settings: "liga", "dlig";
-o-font-feature-settings: "liga", "dlig";
font-feature-settings: "liga", "dlig";
}

2 changes: 1 addition & 1 deletion client/styles/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Site Name: ExpressJS, Socket.IO & AngularJS Boilerplate
Code: Jozef Butko - jozefbutko.com
Date: Dec 2016
Date: Jan 2017
******************************************************************/

Expand Down

0 comments on commit 0099f0e

Please sign in to comment.