Skip to content

Commit e227beb

Browse files
jlukicjlukic
committed
Merge branch 'master' of github.com:Semantic-Org/Semantic-UI-Docs into next
Conflicts: server/documents/introduction/getting-started.html.eco server/documents/introduction/new.html.eco
2 parents d721c11 + b591bba commit e227beb

7 files changed

Lines changed: 179 additions & 9 deletions

File tree

‎server/documents/behaviors/form.html.eco‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ type : 'UI Behavior'
4646
skills: {
4747
identifier : 'skills',
4848
rules: [
49-
type : 'minCount[2]',
50-
prompt : 'Please select at least two skills'
49+
{
50+
type : 'minCount[2]',
51+
prompt : 'Please select at least two skills'
52+
}
5153
]
5254
},
5355
gender: {

‎server/documents/elements/image.html.eco‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ themes : ['Default']
2323
<h4 class="ui header">Image</h4>
2424
<p>An image</p>
2525
<div class="ui ignored message">
26-
Unless a size if specified, images will use the original dimensions of the image up to the size of its container.</code>.
26+
Unless a size is specified, images will use the original dimensions of the image up to the size of its container.</code>.
2727
</div>
2828
<div class="ui ignored info message">
2929
You can specify an <code>img</code> or <code>svg</code> as a <code>ui image</code> or use a child element.</code>
@@ -246,4 +246,4 @@ themes : ['Default']
246246
</div>
247247
</div>
248248

249-
</div>
249+
</div>

‎server/documents/elements/segment.html.eco‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ themes : ['default', 'GitHub']
219219

220220
<div class="piled example">
221221
<h4 class="ui header">Piled Segments</h4>
222-
<p>A group of segments can be raised</p>
222+
<p>A group of segments can be piled</p>
223223
<div class="ui piled segments">
224224
<div class="ui segment">
225225
<p>Top</p>

‎server/documents/introduction/advanced-usage.html.eco‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ type : 'Introduction'
2424
build = require('./semantic/tasks/build')
2525
;
2626
// import task with a custom task name
27-
gulp.task('watch ui', watch));
28-
gulp.task('build ui', build));
27+
gulp.task('watch ui', watch);
28+
gulp.task('build ui', build);
2929
</div>
3030
</div>
3131

@@ -159,7 +159,7 @@ type : 'Introduction'
159159
<p>You can then continue to make modifications to UI and "serve" these files to a live docs instance to see your changes immediately</p>
160160
<div class="code">
161161
cd ui/
162-
gulp build-docs
162+
gulp serve-docs
163163
</div>
164164
</div>
165165
<div class="no example">

‎server/documents/introduction/getting-started.html.eco‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
---
2+
layout : 'default'
3+
css : 'started'
4+
standalone : true
5+
order : 1
6+
7+
title : 'Getting Started'
8+
description : 'Getting up and running with Semantic UI'
9+
type : 'Main'
10+
---
11+
<script src="/javascript/started.js"></script>
12+
13+
<%- @partial('header') %>
14+
15+
<div class="main ui intro container">
16+
17+
<h2 class="ui dividing header">Preface</h2>
18+
19+
<div class="no example">
20+
21+
<h4 class="ui header">Using Build Tools</h4>
22+
23+
<p>Semantic UI packaged Gulp build tools so your project can preserve its <a href="/usage/theming.html">own theme changes</a>.</p>
24+
<p>The easiest way to install Semantic UI is our NPM package which contains special install scripts to make setup interactive and updates seamless.</p>
25+
26+
<p>For installing with specific integrations like, Ember, React, or Meteor, see our <a href="/introduction/integrations.html">integration guide</a></p>
27+
<p>For integrating Semantic UI tasks into your own build tools, or using a CDN see our <a href="/introduction/advanced-usage.html">recipes</a> section.</p>
28+
29+
</div>
30+
31+
<h2 class="ui dividing header">Installing</h2>
32+
33+
34+
<div class="no example">
35+
<h4 class="ui header">Install NodeJS</h4>
36+
<p>If you are unfamiliar with setting up NodeJS you can follow the steps below, or check out the <a href="https://nodejs.org/download/" target="_blank">download page</a> on <a href="http://www.nodejs.org" target="_blank">nodejs.org</a></p>
37+
38+
<div class="ui secondary menu">
39+
<a data-tab="mac" class="active item">Mac</a>
40+
<a data-tab="linux" class="item">Linux</a>
41+
<a data-tab="win" class="item">Windows</a>
42+
</div>
43+
<div class="ui active basic tab vertical segment" data-tab="mac">
44+
<h4>Option 1: Homebrew</h4>
45+
<p>After installing <a href="http://brew.sh/" target="_blank">homebrew</a></p>
46+
<div class="ignored code" data-type="bash">
47+
brew install node
48+
</div>
49+
<h4>Option 2: Git</h4>
50+
<div class="ignored code" data-type="bash">
51+
git clone git://github.com/ry/node.git
52+
cd node
53+
./configure
54+
make
55+
sudo make install
56+
</div>
57+
</div>
58+
<div class="ui basic tab vertical segment" data-tab="linux">
59+
<h4>Install via PPA</h4>
60+
<p>Although <a href="http://www.ubuntuupdates.org/ppa/chris_lea_nodejs" target="_blank">Chris Lea's PPA</a> was once the best way to install node, it is now somewhat out of date.</p>
61+
<p>The recommended path to install Semantic UI is using <a href="https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager" target="_blank">Joyent's package manager</a> guide.</p>
62+
<h4>Ubuntu</h4>
63+
<div class="ignored code" data-type="bash">
64+
curl --silent --location https://deb.nodesource.com/setup_0.12 | sudo bash -
65+
sudo apt-get install --yes nodejs
66+
</div>
67+
<h4>Debian</h4>
68+
<div class="ignored code" data-type="bash">
69+
apt-get install curl
70+
curl --silent --location https://deb.nodesource.com/setup_0.12 | bash -
71+
apt-get install --yes nodejs
72+
</div>
73+
<h4>Red Hat</h4>
74+
<div class="ignored code" data-type="bash">
75+
curl --silent --location https://rpm.nodesource.com/setup | bash -
76+
yum -y install nodejs
77+
</div>
78+
</div>
79+
<div class="ui basic tab vertical segment" data-tab="win">
80+
<h4>Install the exe</h4>
81+
<p>Download the <a href="http://nodejs.org/download/">NodeJS executable</a>.</p>
82+
</div>
83+
</div>
84+
85+
<div class="no example">
86+
<h4>Install Gulp</h4>
87+
<p>Semantic UI uses <a href="http://www.gulpjs.com" target="_blank">Gulp</a> to provide command line tools for building themed versions of the library with just the components you need.</p>
88+
<p>Gulp is an NPM module and must be installed globally</p>
89+
<div class="ignored code" data-type="bash">
90+
npm install -g gulp
91+
</div>
92+
</div>
93+
94+
<div class="no example">
95+
<h4>Install Semantic UI</h4>
96+
<p>Semantic UI is available in an eponymous package on NPM</p>
97+
<div class="ui secondary menu">
98+
<a class="active item" data-tab="video">
99+
Video
100+
</a>
101+
<a class="item" data-tab="code">
102+
Code
103+
</a>
104+
</div>
105+
<div class="ui active tab" data-tab="video">
106+
<script type="text/javascript" src="https://asciinema.org/a/22121.js" id="asciicast-22121" async></script>
107+
</div>
108+
<div class="ui tab" data-tab="code">
109+
<div class="ignored code" data-type="bash">
110+
npm install semantic-ui --save
111+
cd semantic/
112+
gulp build
113+
</div>
114+
</div>
115+
</div>
116+
117+
<div class="no example">
118+
<h4>Include in Your HTML</h4>
119+
<p>Running the gulp build tools will compile css and javascript for use in your project. Just link to these files in your html.</p>
120+
<div class="ignored code" data-type="html" data-escape="true">
121+
&lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; href=&quot;semantic/dist/semantic.min.css&quot;&gt;
122+
&lt;script src=&quot;semantic/dist/semantic.min.js&quot;&gt;&lt;/script&gt;
123+
</div>
124+
</div>
125+
<h2 class="ui dividing header">Updating</h2>
126+
127+
<div class="no example">
128+
<h4>Updating via NPM</h4>
129+
<p>Semantic's NPM install script will automatically update Semantic UI to the latest version while preserving your site and packaged themes.</p>
130+
<div class="ignored code" data-type="bash">
131+
npm update
132+
</div>
133+
</div>
134+
135+
<h2 class="ui dividing header">Next Steps</h2>
136+
137+
<div class="no example">
138+
<h4>All Set!</h4>
139+
<p>Well done! Semantic UI is now ready to be used.</p>
140+
141+
<div class="three column divided stackable center aligned ui grid">
142+
<div class="column">
143+
<div class="ui icon header">
144+
<i class="rocket circular icon"></i>
145+
See how to use <a href="/introduction/build-tools.html">gulp commands</a> and build tools
146+
</div>
147+
</div>
148+
<div class="column">
149+
<div class="ui icon header">
150+
<i class="theme circular icon"></i>
151+
Learn about <a href="/usage/theming.html">changing themes</a>
152+
</div>
153+
</div>
154+
<div class="column">
155+
<div class="ui icon header">
156+
<i class="food circular icon"></i>
157+
See <a href="/introduction/advanced-usage.html">recipes</a> for using Semantic UI in your project
158+
</div>
159+
</div>
160+
</div>
161+
</div>
162+
163+
</div>

‎server/documents/modules/dimmer.html.eco‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ themes : ['Default']
258258
<p>You can display a dimmer by either invoking .dimmer('show') on a section or a dimmer itself. If you choose to dim a dimmable section, a dimmer will automatically be created.</p>
259259
<div class="ignored code">
260260
// these two are the same
261-
$('.ui.dimmable)
261+
$('.ui.dimmable')
262262
.dimmer('show')
263263
;
264264
$('.ui.dimmable .dimmer')

‎server/documents/modules/popup.html.eco‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,11 @@ themes : ['Default']
684684
<td>10</td>
685685
<td>Number of iterations before giving up search for popup position when a popup cannot fit on screen</td>
686686
</tr>
687+
<tr>
688+
<td>inverted</td>
689+
<td>false</td>
690+
<td>Invert text and background colors</td>
691+
</tr>
687692
</tbody>
688693
</table>
689694

0 commit comments

Comments
 (0)