Преглед изворни кода

Merge about us and services

master
Nikola Ignjatovic пре 5 година
родитељ
комит
b42c7570ff
6 измењених фајлова са 123 додато и 31 уклоњено
  1. 3
    2
      apply.html
  2. 4
    2
      careers.html
  3. 105
    17
      index.html
  4. 4
    3
      portfolio.html
  5. 1
    1
      style.css
  6. 6
    6
      styles/custom.css

+ 3
- 2
apply.html Прегледај датотеку

@@ -88,7 +88,7 @@
<li><a data-id ="about-section" class="home_link" href="index.html">about us</a></li>
<li><a data-id="our_partners-section" class="home_link" href="index.html">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services-section" class="home_link" href="index.html">services</a></li>
<!-- <li><a data-id ="services-section" class="home_link" href="index.html">services</a></li> -->
<!--<li><a data-id ="teams-wrap" class="home_link" href="index.html">teams</a></li>-->
<!-- <li><a href="#gallery-wrap">gallery</a></li>
@@ -106,7 +106,8 @@
<li><a data-id ="about-section" class="home_link" href="#about-section">about us</a></li>
<li ><a data-id="our_partners-section" class="home_link" href="#our_partners-section">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services-section" class="home_link" href="#services-section">services</a></li>
<!-- <li><a data-id ="services-section" class="home_link" href="#services-section">services</a></li> -->

<!-- <li><a href="#gallery-wrap">gallery</a></li>
<li><a href="#events-wrap">events</a></li>
<li><a href="#stats-wrap">states</a></li>

+ 4
- 2
careers.html Прегледај датотеку

@@ -87,7 +87,8 @@
<li><a data-id ="about-section" class="home_link" href="index.html">about us</a></li>
<li><a data-id="our_partners-section" class="home_link" href="index.html">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services-section" class="home_link" href="index.html">services</a></li>
<!-- <li><a data-id ="services-section" class="home_link" href="index.html">services</a></li> -->
<!--<li><a data-id ="teams-wrap" class="home_link" href="index.html">teams</a></li>-->
<!-- <li><a href="#gallery-wrap">gallery</a></li>
@@ -105,7 +106,8 @@
<li><a data-id ="about-section" class="home_link" href="#about-section">about us</a></li>
<li ><a data-id="our_partners-section" class="home_link" href="#our_partners-section">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services-section" class="home_link" href="#services-section">services</a></li>
<!-- <li><a data-id ="services-section" class="home_link" href="#services-section">services</a></li> -->

<!-- <li><a href="#gallery-wrap">gallery</a></li>
<li><a href="#events-wrap">events</a></li>
<li><a href="#stats-wrap">states</a></li>

+ 105
- 17
index.html Прегледај датотеку

@@ -52,7 +52,7 @@
<li class="about-section"><a class="clear_storage " href="#about-section">about us</a></li>
<li class="our_partners-section"><a class="clear_storage " href="#our_partners-section">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li class="services-section"><a class="clear_storage " href="#services-section">services</a></li>
<!-- <li class="services-section"><a class="clear_storage " href="#services-section">services</a></li> -->
<!--<li class="teams-wrap"><a data-id ="teams_wrap" class="clear_storage" href="#teams-wrap">teams</a></li>-->
@@ -72,7 +72,8 @@
<li><a data-id ="aboutus_link" class="clear_storage" href="#about-section">about us</a></li>
<li class="our_partners-section"><a class="clear_storage " href="#our_partners-section">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services_link" class="clear_storage" href="#services-section">services</a></li>
<!-- <li><a data-id ="services_link" class="clear_storage" href="#services-section">services</a></li> -->

<!--<li><a data-id ="teams_link" class="clear_storage" href="#teams-wrap">teams</a></li>-->

<!-- <li><a href="#gallery-wrap">gallery</a></li>
@@ -214,7 +215,100 @@
</div>
</div>--> <!--end Important Info-->
</section>
<section id="services" class="services general-section clearfix">
<!--<div class="section-triangle-dark"></div>-->
<!-- <div class="section-title">
<h2>Services</h2>
<h5>See all we have to offer you</h5>
</div> -->
<div class="services-intro">
<div class="one_half wow bounceInLeft"><img src="images/services.png" alt=""></div>
<div class="one-half last">
<h3>We develop technology solutions</h3>
<p><strong>Our Vision</strong> is to be a leading software solutions company for veriety of industries. We know that Customer’s growth is our growth, so we commit ourselves to help the customers in achieving their business goals. We want to be known as reliable, innovative and top quality software service provider in IT industry.<br/></p>

<p><strong>Our Mission </strong>is to enhance business growth of our customers with creative design, development and to deliver market defining high quality solutions that create value and reliable competitive advantage to customers around the globe.</p>
</div>
</div><!-- end Services Intro -->
<div class="one_half services-item clearfix">
<div class="hive">
<div class="hex outer-hex">
<div class="hex-in1">
<div class="hex-in2 gray-background outer-hex">
<div class="hex inner-hex">
<div class="hex-in1">
<div class="services-icon1 hex-in2 hex-area"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="services-info">
<h3>Product Development</h3>
<p>Our top-notch engineering team is ready to implement your game-changing ideas with both front-end and back-end services. We also partner long-term with brands to ensure their digital offerings stay fresh.</p>
</div>
</div><!-- end Services Item -->
<div class="one_half services-item clearfix last">
<div class="hive">
<div class="hex outer-hex">
<div class="hex-in1">
<div class="hex-in2 outer-hex">
<div class="hex inner-hex">
<div class="hex-in1">
<div class="services-icon2 hex-in2 hex-area"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="services-info">
<h3>Priceless Creativity</h3>
<p>Creativity is more than just being different. Making the SIMPLE, that is creativity.</p>
</div>
</div><!-- end Services Item -->
<div class="one_half services-item clearfix">
<div class="hive">
<div class="hex outer-hex ">
<div class="hex-in1">
<div class="hex-in2 outer-hex">
<div class="hex inner-hex">
<div class="hex-in1">
<div class="services-icon3 hex-in2 hex-area"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="services-info">
<h3>Business Security</h3>
<p>We have highly-trained and experienced professionals who build relationships of trust and measurable value with our clients, guaranteeing that your business is in safe hands. </p>
</div>
</div><!-- end Services Item -->
<div class="one_half services-item clearfix last">
<div class="hive">
<div class="hex outer-hex non-margin">
<div class="hex-in1">
<div class="hex-in2 outer-hex">
<div class="hex inner-hex">
<div class="hex-in1">
<div class="services-icon4 hex-in2 hex-area"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="services-info">
<h3>Quick Response</h3>
<p>We are fully aware that your business relies on our software and we want not let you down in emergency situations.</p>
</div>
</div><!-- end Services Item -->
</section>
</div><!-- end About -->
<div id="our_partners-section" class="dark home-section" >
<div class="our_partners-cont" style=" background-image: url(images/business-bg.png);background-size: cover;">
@@ -602,9 +696,9 @@
</section>
</div>
</div>
<div id="services-section" class="home-section">
<!-- <div id="services-section" class="home-section">
<section id="services" class="services general-section clearfix">
<!--<div class="section-triangle-dark"></div>-->
<div class="section-title">
<h2>Services</h2>
<h5>See all we have to offer you</h5>
@@ -619,7 +713,7 @@
<p><strong>Our Mission </strong>is to enhance business growth of our customers with creative design, development and to deliver market defining high quality solutions that create value and reliable competitive advantage to customers around the globe.</p>
</div>
</div><!-- end Services Intro -->
</div>
<div class="one_half services-item clearfix">
<div class="hive">
<div class="hex outer-hex">
@@ -638,7 +732,7 @@
<h3>Product Development</h3>
<p>Our top-notch engineering team is ready to implement your game-changing ideas with both front-end and back-end services. We also partner long-term with brands to ensure their digital offerings stay fresh.</p>
</div>
</div><!-- end Services Item -->
</div>
<div class="one_half services-item clearfix last">
<div class="hive">
<div class="hex outer-hex">
@@ -657,7 +751,7 @@
<h3>Priceless Creativity</h3>
<p>Creativity is more than just being different. Making the SIMPLE, that is creativity.</p>
</div>
</div><!-- end Services Item -->
</div>
<div class="one_half services-item clearfix">
<div class="hive">
<div class="hex outer-hex ">
@@ -676,7 +770,7 @@
<h3>Business Security</h3>
<p>We have highly-trained and experienced professionals who build relationships of trust and measurable value with our clients, guaranteeing that your business is in safe hands. </p>
</div>
</div><!-- end Services Item -->
</div>
<div class="one_half services-item clearfix last">
<div class="hive">
<div class="hex outer-hex non-margin">
@@ -695,16 +789,13 @@
<h3>Quick Response</h3>
<p>We are fully aware that your business relies on our software and we want not let you down in emergency situations.</p>
</div>
</div><!-- end Services Item -->
</div>
</section>
</div><!-- end Services -->
</div>-->
<!--start teams-->
<<<<<<< HEAD
<!--<div id="teams-wrap">
=======
<div id="teams-wrap">
>>>>>>> 4a9d59f25d66ae0a6182dfe2709e8312ca671896
<div class="section-triangle-grey"></div>
<section class="general-section u-align-center u-clearfix u-custom-typography u-typography-custom-page-typography-38-Team u-white u-section-1" id="carousel_e6e6">
<div class="u-clearfix u-sheet u-valign-middle u-sheet-1">
@@ -791,12 +882,9 @@
</div>
</div>
</section>
<<<<<<< HEAD
</div>
</div> -->
=======
</div>
>>>>>>> 4a9d59f25d66ae0a6182dfe2709e8312ca671896
<!--end teams-->
<div id="contact-section" class="home-section dark" style="background-image: url('images/contact_bg.png'); background-repeat: no-repeat; background-position: center 70px">

+ 4
- 3
portfolio.html Прегледај датотеку

@@ -86,7 +86,7 @@
<li><a data-id ="about-section" class="home_link" href="index.html">about us</a></li>
<li><a data-id="our_partners-section" class="home_link" href="index.html">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services-section" class="home_link" href="index.html">services</a></li>
<!-- <li><a data-id ="services-section" class="home_link" href="index.html">services</a></li> -->
<!-- <li><a data-id ="teams-wrap" class="home_link" href="index.html">teams</a></li> -->

<!-- <li><a href="#gallery-wrap">gallery</a></li>
@@ -104,14 +104,15 @@
<li><a data-id ="about-section" class="home_link" href="#about-section">about us</a></li>
<li ><a data-id="our_partners-section" class="home_link" href="#our_partners-section">our partners</a></li>
<!-- <li><a href="#team-wrap">our team</a></li> -->
<li><a data-id ="services-section" class="home_link" href="#services-section">services</a></li>
<!-- <li><a data-id ="services-section" class="home_link" href="#services-section">services</a></li> -->

<!-- <li><a href="#gallery-wrap">gallery</a></li>
<li><a href="#events-wrap">events</a></li>
<li><a href="#stats-wrap">states</a></li>
<li><a href="#news-wrap">news</a></li> -->
<li><a data-id ="contact-section" class="home_link" href="#contact-section">contact</a></li>
<li ><a href="careers.html">careers</a></li>
<li ><a href="careers.html">careers</a></li>
<li class="active portfolio"><a href="portfolio.html">portfolio</a><span class="nav-active-mark"></span></li>
</ul>
</nav><!-- end Navigation -->

+ 1
- 1
style.css Прегледај датотеку

@@ -664,7 +664,7 @@ p .bold-team-info,
border-bottom-style: solid;
border-bottom-width: 10px;
position: absolute;
bottom: -13px;
bottom: -18px;
left: 43%;
}
#navigation ul li.portfolio.active .nav-active-mark

+ 6
- 6
styles/custom.css Прегледај датотеку

@@ -153,10 +153,10 @@ a:hover
/*background-color: #f6f6f6;*/
display: none;
}
#about-section
/* #about-section
{
padding-bottom: 240px;
}
} */
#gallery
{
position: relative;
@@ -178,7 +178,7 @@ a:hover
{
font-size: 40px;
}
#services:before
#our_partners-section:before
{
content: "";
position: absolute;
@@ -186,12 +186,12 @@ a:hover
height: 0;
border-style: solid;
border-width: 36px 63px 0px 63px;
border-color: #060504 transparent transparent transparent;
top: -5px;
border-color: #f6f6f6 transparent transparent transparent;
top: 0;
left: 50%;
transform: translateX(-50%);
z-index: 11;
opacity: .8;
opacity: 1;
}
.successfully
{

Loading…
Откажи
Сачувај