Skip to content

Commit

Permalink
Included STYLmethods
Browse files Browse the repository at this point in the history
  • Loading branch information
@soyjavi committed Jul 28, 2014
1 parent 8464634 commit 840b0a6
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 29 deletions.
7 changes: 5 additions & 2 deletions .gitmodules
View file
@@ -1,3 +1,6 @@
[submodule "/package"]
path = /package
[submodule "package"]
path = package
url = https://github.com/soyjavi/package-tuktuk.git
[submodule "source/styl/STYLmethods"]
path = source/styl/STYLmethods
url = https://github.com/soyjavi/STYLmethods.git
2 changes: 1 addition & 1 deletion gulpfile.js
View file
Expand Up @@ -67,7 +67,7 @@ gulp.task('theme', function() {
});

gulp.task('webserver', function() {
connect.server({ port: 8000, root: 'www/', livereload: true });
connect.server({ port: 8000, root: './', livereload: true });
});

gulp.task('init', function() {
Expand Down
1 change: 1 addition & 0 deletions source/styl/STYLmethods
Submodule STYLmethods added at f7726e
2 changes: 1 addition & 1 deletion source/styl/__init.styl
View file
@@ -1,4 +1,4 @@
@import "../components/CSSmethods/vendor.styl"
@import "STYLmethods/vendor.styl"

FONT-SIZE = 14px
FONT-SIZE-LARGE = 1.4em
Expand Down
2 changes: 1 addition & 1 deletion source/styl/theme/__init.styl
View file
@@ -1,4 +1,4 @@
@import "../../components/CSSmethods/vendor.styl"
@import "../STYLmethods/vendor.styl"

/* DEFAULTS */
COLOR = #222
Expand Down
8 changes: 4 additions & 4 deletions www/examples/app.html
View file
Expand Up @@ -5,10 +5,10 @@
<title>tuktuk - Application Example</title>
<!-- Mobile Specific Metas -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="stylesheet" href="../package/tuktuk.css">
<link rel="stylesheet" href="../package/tuktuk.theme.default.css">
<link rel="stylesheet" href="../../package/tuktuk.css">
<link rel="stylesheet" href="../../package/tuktuk.theme.default.css">
<!-- TUKTUK.WIDGETS -->
<link rel="stylesheet" href="../package/tuktuk.icons.css">
<link rel="stylesheet" href="../../package/tuktuk.icons.css">
<style>
.thumb {
height: 96px;
Expand Down Expand Up @@ -197,7 +197,7 @@ <h4 class="inline text book">Side window.</h4>
</div>

<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script src="../package/tuktuk.js"></script>
<script src="../../package/tuktuk.js"></script>
<script>
TukTuk.Modal.loading();
setTimeout( TukTuk.Modal.hide, 1000);
Expand Down
8 changes: 4 additions & 4 deletions www/examples/blog.html
View file
Expand Up @@ -4,9 +4,9 @@
<meta charset="utf-8" />
<title>TukTuk - Blog Template</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="stylesheet" href="../package/tuktuk.css">
<link rel="stylesheet" href="../package/tuktuk.theme.default.css">
<link rel="stylesheet" href="../package/tuktuk.icons.css">
<link rel="stylesheet" href="../../package/tuktuk.css">
<link rel="stylesheet" href="../../package/tuktuk.theme.default.css">
<link rel="stylesheet" href="../../package/tuktuk.icons.css">
<style>
body > header .logo {
margin-right: 1rem;
Expand Down Expand Up @@ -127,6 +127,6 @@ <h5 class="text normal">Users</h5>
</footer>

<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script src="../package/tuktuk.js"></script>
<script src="../../package/tuktuk.js"></script>
</body>
</html>
8 changes: 4 additions & 4 deletions www/examples/landing.html
View file
Expand Up @@ -5,10 +5,10 @@
<title>tuktuk - Landing Example</title>
<!-- Mobile Specific Metas -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="stylesheet" href="../package/tuktuk.css">
<link rel="stylesheet" href="../package/tuktuk.theme.default.css">
<link rel="stylesheet" href="../../package/tuktuk.css">
<link rel="stylesheet" href="../../package/tuktuk.theme.default.css">
<!-- TUKTUK.WIDGETS -->
<link rel="stylesheet" href="../package/tuktuk.icons.css">
<link rel="stylesheet" href="../../package/tuktuk.icons.css">
<style>
body > header .logo {
margin-right: 1rem;
Expand Down Expand Up @@ -143,6 +143,6 @@ <h3 class="text thin">Javi Jimenez is the CTO and co-founder of <a href="http://
</footer>

<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script src="../package/tuktuk.js"></script>
<script src="../../package/tuktuk.js"></script>
</body>
</html>
8 changes: 4 additions & 4 deletions www/examples/profile.html
View file
Expand Up @@ -5,10 +5,10 @@
<title>tuktuk - Profile Example</title>
<!-- Mobile Specific Metas -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
<link rel="stylesheet" href="../package/tuktuk.css">
<link rel="stylesheet" href="../package/tuktuk.theme.default.css">
<link rel="stylesheet" href="../../package/tuktuk.css">
<link rel="stylesheet" href="../../package/tuktuk.theme.default.css">
<!-- TUKTUK.WIDGETS -->
<link rel="stylesheet" href="../package/tuktuk.icons.css">
<link rel="stylesheet" href="../../package/tuktuk.icons.css">
<style>
body > header .logo {
margin-right: 1rem;
Expand Down Expand Up @@ -123,6 +123,6 @@ <h2 class="text bold inline">Thumbs</h2>
</footer>

<script src="http://code.jquery.com/jquery-1.9.1.min.js"></script>
<script src="../package/tuktuk.js"></script>
<script src="../../package/tuktuk.js"></script>
</body>
</html>
16 changes: 8 additions & 8 deletions www/index.html
View file
Expand Up @@ -14,9 +14,9 @@
<title>TukTuk</title>
<!-- STYLESHEETs -->
<link rel="icon" href="http://tuktuk.tapquo.com/img/favicon.png" type="image/x-icon">
<link rel="stylesheet" href="/package/tuktuk.css">
<link rel="stylesheet" href="/package/tuktuk.theme.default.css">
<link rel="stylesheet" href="/package/tuktuk.icons.css">
<link rel="stylesheet" href="../package/tuktuk.css">
<link rel="stylesheet" href="../package/tuktuk.theme.default.css">
<link rel="stylesheet" href="../package/tuktuk.icons.css">
</head>

<body data-stellar-background-ratio="0.6" data-page="index", data-product="tuktuk">
Expand Down Expand Up @@ -112,26 +112,26 @@ <h2>As a picture is worth a thousand words (or hundreds of lines of code), check

<div class="row align center">
<div class="column_3">
<a href="/microsites/tuktuk_blog.html" target="_blank" class="tip-right" data-tip="Click to view">
<a href="examples/blog.html" target="_blank" class="tip-right" data-tip="Click to view">
<img src="http://tuktuk.tapquo.com/img/product/tuktuk/template-blog.png" class="responsive">
</a>
<h6><strong>Blog</strong> Page</h6>
</div>
<div class="column_3">
<a href="/microsites/tuktuk_landing.html" target="_blank" class="tip-right" data-tip="Click to view">
<a href="examples/landing.html" target="_blank" class="tip-right" data-tip="Click to view">
<img src="http://tuktuk.tapquo.com/img/product/tuktuk/template-landing.png" class="responsive">
</a>
<h6><strong>Landing</strong> Page</h6>
</div>
<div class="column_3">
<a href="/microsites/tuktuk_profile.html" target="_blank" class="tip-left" data-tip="Click to view">
<a href="examples/profile.html" target="_blank" class="tip-left" data-tip="Click to view">
<img src="http://tuktuk.tapquo.com/img/product/tuktuk/template-profile.png" class="responsive">
</a>
<h6><strong>Profile</strong> Page</h6>
</div>

<div class="column_3">
<a href="/microsites/tuktuk_app.html" target="_blank" class="tip-left" data-tip="Click to view">
<a href="examples/app.html" target="_blank" class="tip-left" data-tip="Click to view">
<img src="http://tuktuk.tapquo.com/img/product/tuktuk/template-app.png" class="responsive">
</a>
<h6>Web <strong>Application</strong></h6>
Expand Down Expand Up @@ -198,6 +198,6 @@ <h2>
</section>

<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="/package/tuktuk.js"></script>
<script src="../package/tuktuk.js"></script>
</body>
</html>

0 comments on commit 840b0a6

Please sign in to comment.