Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/himanshu-daga/Webster
Browse files Browse the repository at this point in the history
  • Loading branch information
@himanshu-daga
himanshu-daga committed Oct 28, 2017
2 parents 0ded4f3 + 311caa0 commit a013759
Show file tree
Hide file tree
Showing 8 changed files with 360 additions and 24 deletions.
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
## Contribution guidelines
It is simple. Just make something like sample1 directory in forms.
Refer following points
1. Browse the element you want to add in **html elements**.
2. If your element already exists(like forms) then create new directory in that repo with sample1, sample2 ,...
else make a new repo with name of the element such as img, header, navbar, footer etc. and create a new directory with sample1 name in it.
3. Now add your files in it.
4. Enter your content in following format in the file:
```html
<!DOCTYPE html>
<html>
<head>
<title> TEST </title>
//if using external style sheet then use following:
//<link rel="stylesheet" type="text/css" href="https://abc.com/style/sample.css">
<style>
//enter your css here
</style>
</head>
<body>
//enter your html snippet here
</body>
</html>
```
5. Now add a screenshot of your html page in browser.
6. Now create a pull request and it's done!!!
8 changes: 8 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Changes proposed in this pull request:
-
-
-

Check that following are added:
-[] HTML and CSS files.
-[] Screenshots.
34 changes: 10 additions & 24 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,16 @@ Contributing here is easy, you just need to have basics of HTML and CSS and you

## Contribution guidelines
It is simple. Just make something like sample1 directory in forms.
Refer following points
1. Browse the element you want to add in **html elements**.
2. If your element already exists(like forms) then create new directory in that repo with sample1, sample2 ,...
else make a new repo with name of the element such as img, header, navbar, footer etc. and create a new directory with sample1 name in it.
3. Now add your files in it.
4. Enter your content in following format in the file:
```html
<!DOCTYPE html>
<html>
<head>
<title> TEST </title>
//if using external style sheet then use following:
//<link rel="stylesheet" type="text/css" href="https://abc.com/style/sample.css">
<style>
//enter your css here
</style>
</head>
<body>
//enter your html snippet here
</body>
</html>
```
5. Now add a screenshot of your html page in browser.
6. Now create a pull request and it's done!!!
Follow following steps:
1. Browse the element you want to add in **html elements**.
2. If your element already exists(like forms) then create new directory in that repo with sample1, sample2 ,...
else make a new repo with name of the element such as img, header, navbar, footer etc. and create a new directory with sample1 name in it.
3. Now add your files in it.
4. Enter your html and css content in the file.
5. Now add a screenshot of your html page in browser.
6. Now create a pull request and it's done!!!

Or refer **[CONTRIBUTION.md](https://github.com/himanshu-daga/Webster/blob/master/CONTRIBUTING.md)** :

## License

Expand Down
Binary file added blogLayout/sample3/bloglayoutsample3.PNG
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions blogLayout/sample3/bootstrap.css
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions blogLayout/sample3/font-awesome.min.css
View file

Large diffs are not rendered by default.

131 changes: 131 additions & 0 deletions blogLayout/sample3/index.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Vadikcorp</title>
<!-- LATO -->
<link href="https://fonts.googleapis.com/css?family=Lato:400,900,900i" rel="stylesheet">
<!-- Bootstrap -->
<link href="bootstrap.css" rel="stylesheet">
<!-- Font Awesome -->
<link rel="stylesheet" href="font-awesome.min.css">
<!-- MAIN CSS -->
<link rel="stylesheet" href="style.css">

</head>
<body>
<div id="wrapper">
<div class="container-fluid">
<div class="row">
<!-- ***SIDEBAR*** -->
<div id="sidebar" class="col-xs-12 col-sm-5 col-md-4 col-lg-4">
<div class="photo"><img src="img/me.jpg" alt="This is me" id="profile-1" class="photome" height="142px" width="142px"></div>
<h2 id="profile-2" >vadikcorp</h2>
<h4 id="profile-3" >Lviv, Ukraine</h4>
<!-- Link-telegran+linkedin+github+mail -->
<div class="link ">
<a target="_blank" href="http://telegram.me/vadikcorp"><i id="iconanim"class="fa fa-telegram link-icon" aria-hidden="true"></i></a>
<a target="_blank" href="https://www.linkedin.com/in/vadym-vasko-649726134/"><i class="fa fa-linkedin-square link-icon" id="iconanim" aria-hidden="true"></i></a>
<a target="_blank" href="http://github.com/vadikcorp"><i id="iconanim"class="fa fa-github link-icon" aria-hidden="true"></i></a>
<a href="mailto:[email protected]"><i class="fa fa-envelope link-icon" id="iconanim" aria-hidden="true"></i></a>
</div>
<!-- My skill -->
<p class="about__one" id="text-area-1">I'm currently using</p>
<ul class="skillset" id="text-area-2">
<li class="skill">HTML5</li>
<li class="skill">CSS3</li>
<li class="skill">JavaScript</li>
<br>
<li class="skill">Bootstrap</li>
<li class="skill">Git</li>
<li class="skill">Atom</li>
<br>
<li class="skill">NodeJS</li>
<li class="skill">Adobe Photoshop</li>
</ul>
<p class="about__two" id="text-area-3">I've experimented with</p>
<ul class="skillset" id="text-area-4">
<li class="skill">Sass</li>
<li class="skill">ES6</li>
<li class="skill">Flexbox</li>
<br>
<li class="skill">PHP</li>

<li class="skill">Jquery</li>
</ul>
</div>
<!-- ***SIDEBAR END*** -->
<!-- ***CONTENT*** -->
<div class="col-xs-12 col-sm-7 col-md-8 col-lg-8">
<div class="grid">
<div class="row">
<!-- PROJECT ONE -->
<div id="section-1" class="col-xs-12 col-sm-6 col-md-4 col-lg-3 project projectone ">

<div class="project__photo">
<a href="https://vadikcorp.github.io/nuphelp_site/"> <img class="photo__project" src="img/telegram.png" alt="project telegram_chatbot" width="100%" height="100%"></a>
</div>

<div class="project__text">
<a href="https://vadikcorp.github.io/nuphelp_site/" class="a__head"><h4>Chatbot via Telegram</h4></a>
<p>Chatbot "NULP Help" is designed to facilitate student's life. Chatbot was created via Telegram</p>
</div>

<div class="view">
<a href="https://vadikcorp.github.io/nuphelp_site/" target="_blank"><input type="button" name="view" value="view" class="button-css"></a>
<br>
<a href="https://github.com/vadikcorp/nulphelp_bot" target="_blank"><input type="button" name="viewgit" value="view on github" class="button-css"></a>
</div>
<!-- link__view -->
</div>
<!-- PROJECT TWO -->
<div id="section-2" class="col-xs-12 col-sm-6 col-md-4 col-lg-3 project projecttwo ">

<div class="project__photo">
<a href="">
<img class="photo__project" src="img/portfolio.png" alt="project cypher" width="100%" height="100%"></a>
</div>

<div class="project__text">
<a href="" class="a__head"><h4>My website-portfolio</h4></a>
<p>My web site where you <br> are now.</p>
</div>

<div class="view">
<a href="https://vadikcorp.github.io" target="_blank"><input type="button" name="view" value="view" class="button-css"></a>
<br>
<a href="https://github.com/vadikcorp/vadikcorp.github.io" target="_blank"><input type="button" name="viewgit" value="view on github" class="button-css"></a>
</div>
</div>
<!-- PROJECT THREE -->
<div id="section-3" class="col-xs-12 col-sm-6 col-md-4 col-lg-3 project projectthree ">

<div class="project__photo">
<a href="https://vadikcorp.github.io/ciphers/"><img class="photo__project" src="img/projectcypher.jpg" alt="project my portfolio" width="100%" height="110%"></a>
</div>

<div class="project__text">
<a href="https://vadikcorp.github.io/ciphers/" class="a__head">
<h4>Cipher project</h4></a>
<p>This is my project for university.Its include few cypher like caesar and vigener cipher,statistical analysis and direct submission method</p>
</div>

<div class="view">
<a href="https://vadikcorp.github.io/ciphers/" target="_blank"><input type="button" name="view" value="view" class="button-css"></a>
<br>
<a href="https://github.com/vadikcorp/ciphers" target="_blank"><input type="button" name="viewgit" value="view on github" class="button-css"></a>
</div>

</div>

</div>
</div>
</div>
<!-- ***CONTENT END*** -->
</div>
</div>
</div>
</body>
</html>
175 changes: 175 additions & 0 deletions blogLayout/sample3/style.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
html,
body {
overflow-x: hidden;
/* Prevent scroll on narrow devices */
display: block;
}
html {
box-sizing: border-box;
}
*, *:before, *:after {
box-sizing: inherit;
outline: 0;
}
#wrapper {
font-family: 'Lato', sans-serif;
font-size: 16px;
line-height: 1.55;
}
/*
=====================
SIDEBAR
=====================
*/
#sidebar {
z-index: 100;
text-align: center;
color:#777777;
font-size: 110%;
}
.photo {
padding: 80px 0px 0px 0px;
}
.photome {
border-radius: 100px;
}
#sidebar h2 {
font-size:20px;
}
#sidebar h4 {
font-size: 14px;
padding-top: 0px;
line-height: 0.7em;
font-style: italic;
}
.link{
margin-top: 20px;
margin-left: 10px;
}
.link-icon {
color: #000000;
margin-right: 10px;
font-size: 120%;
}
.about__one {
margin-top: 20px;
font-weight: 900;
}
.about__two {
font-weight: 900;
}
#sidebar p{
font-size: 15px;
}
.skillset {
padding-right: 39px;
font-size: 80%;
}
.skill {
display: inline-block;
margin: 0 3px;
padding: 0;
list-style: none;
}
/*
=====================
CONTENT
=====================
*/
.project {
border-radius: 10px;
z-index: 100;
margin: 5px 0px 25px 45px;
padding:0px;
width: 230px;
background-color: #ffffff;
box-shadow: 1px 1px 10px #bdc3c7;
transition: all .3s ease-out;
}
.project:hover {
box-shadow: 2px 2px 30px #777;
}
.photo__project{
transition: all .2s ease-out;
}
.grid {
padding-top: 80px;
}
.info__icon {
display: none;
font-size: 350%;
}
.projectone {
height: 370px;
}
.projecttwo {
height: 300px;
}
.projectthree {
height: 450px;
}
.projectthree .project__text{
padding:25px 7px 0px 10px;
}

.project__text {
height: 60%;
padding:5px 7px 0px 10px;
}
.project__photo {
height: 40%;
}
.photo__project {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.view {
margin: -70px 30px 0px 30px;
}
.photo__project {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
}
.project__text p {
color: #999;
font-size: 15px;
margin-bottom: 0px;
}
.button-css {
cursor: pointer;
padding: 0 22px;
font-size: 15px;
width: 170px;
height: 25px;
margin-bottom: 5px;
border: 0;
color: #fff;
border: 1px solid #777777;
text-align: center;
background: #7f8c8d;
border-radius: 5px;
letter-spacing: 0.1em;
}
.button-css:hover {
box-shadow: 2px 2px 3px #777777;
color: #7f8c8d;
background: #ffffff;
}
.a__head:hover {
text-decoration:none
}
a {
text-decoration: none;
cursor: pointer;
}
.a__head h4 {
font-weight: 900;
color:black;
letter-spacing: .01em;
font-size: 14px;
text-transform: uppercase;
}

0 comments on commit a013759

Please sign in to comment.