Updates to design

build-validation
Rebecca Hollis 5 years ago
parent 86664ad3c5
commit ab68d7b180

@ -9,49 +9,13 @@
<!-- Custom CSS -->
<<<<<<< HEAD
<link rel="stylesheet" href="styles/Design1.css">
<title>Resources</title>
<title>Resources</title>
</head>
<body>
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#">Navbar</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown</a>
<div class="dropdown-menu" aria-labelledby="dropdown01">
<a class="dropdown-item" href="#">Action</a>
<a class="dropdown-item" href="#">Another action</a>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
</form>
</div>
</nav>
=======
<link rel="stylesheet" href="styles/theme.css">
<link rel="stylesheet" href="styles/ResourcesLandingPage.css">
<title>Resources</title>
<title>ResourcePoint</title>
</head>
<body>
<header>
@ -60,17 +24,13 @@
<div class="row">
<div class="col-sm-8 col-md-7 py-4">
<h4 class="text-white">About</h4>
<p class="text-muted">Add some information about the album below, the author, or any other
background context. Make it a few sentences long so folks can pick up some informative tidbits.
Then, link them off to some social networking sites or contact information.</p>
<p class="text-muted">You rely on a vast amount of resources to do your job. How can you keep track of them all? Explore ResourcePoint. From project-management applications to expense reports, this centralized resource center can <i>point</i> you in the right direction.</p>
</div>
<div class="col-sm-4 offset-md-1 py-4">
<h4 class="text-white">Contact</h4>
<ul class="list-unstyled">
<li><a href="#" class="text-white">Follow on Twitter</a></li>
<li><a href="#" class="text-white">Like on Facebook</a></li>
<li><a href="#" class="text-white">Email me</a></li>
</ul>
<ul class="list-unstyled">
<li><a href="#" class="text-white">Help</a></li>
<li><a href="#" class="text-white">Feedback</a></li>
</ul>
</div>
</div>
</div>
@ -78,14 +38,7 @@
<div class="navbar navbar-dark bg-dark shadow-sm">
<div class="container d-flex justify-content-between">
<a href="#" class="navbar-brand d-flex align-items-center">
<svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-book" fill="currentColor"
xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M1 2.828v9.923c.918-.35 2.107-.692 3.287-.81 1.094-.111 2.278-.039 3.213.492V2.687c-.654-.689-1.782-.886-3.112-.752-1.234.124-2.503.523-3.388.893zm7.5-.141v9.746c.935-.53 2.12-.603 3.213-.493 1.18.12 2.37.461 3.287.811V2.828c-.885-.37-2.154-.769-3.388-.893-1.33-.134-2.458.063-3.112.752zM8 1.783C7.015.936 5.587.81 4.287.94c-1.514.153-3.042.672-3.994 1.105A.5.5 0 0 0 0 2.5v11a.5.5 0 0 0 .707.455c.882-.4 2.303-.881 3.68-1.02 1.409-.142 2.59.087 3.223.877a.5.5 0 0 0 .78 0c.633-.79 1.814-1.019 3.222-.877 1.378.139 2.8.62 3.681 1.02A.5.5 0 0 0 16 13.5v-11a.5.5 0 0 0-.293-.455c-.952-.433-2.48-.952-3.994-1.105C10.413.809 8.985.936 8 1.783z"/>
</svg>
&nbsp;
<strong>Resources</strong>
<strong>ResourcePoint</strong>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader"
aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation">
@ -97,28 +50,20 @@
<main role="main">
<section class="jumbotron text-center">
<div class="container">
<h1>Resources</h1>
<p class="font-weight-normal" style="font-size: 17px">Whether you're looking for a folder, document, tool,
website or application, you can find it here.</p>
<div>
<a href="#" class="btn btn-primary my-2">Learn more</a>
<a href="#" class="btn btn-secondary my-2">Send feedback</a>
</div>
</div>
</section>
<div class="album py-5 bg-light">
<div class="container">
<input class="form-control form-control-dark w-100" type="text" placeholder="Search" aria-label="Search">
</div>
<div class="row">
<div class="album py-5 bg-light">
<div class="container">
<div class="row">
<div class="col-md-4">
<div class="card mb-4 shadow-sm">
<img class="card-img-top" src="../images/InterfaceImagine_356x280.png" alt="Computer screen">
<div class="card-body">
<p class="card-text">Would you like to view a design that looks more like an application
than a web page? Check out this <a href="ResourcesInterface.html">alternative layout</a>.
<p class="card-text">Would you like to view a design that has apps and a dashboard? Check out this <a href="ResourcesInterface.html">alternative layout</a>.
</p>
<div class="d-flex justify-content-between align-items-center">
<div class="btn-group">
@ -293,25 +238,17 @@
</div>
</div>
</div>
>>>>>>> origin/master
<main role="main" class="container">
<<<<<<< HEAD
<div class="starter-template">
<h2 class="text-black">Design Options</h2>
<p class="lead">Click a link below to view a design option.</p>
<ul class="list-unstyled">
<li><a href="/Design1.html" class="text-black">Design 1</a></li>
<li><a href="/Design2.html" class="text-black">Design 2</a></li>
<li><a href="/Design3.html" class="text-black">Design 3</a></li>
</ul>
</div>
</main><!-- /.container -->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="/docs/4.5/assets/js/vendor/jquery.slim.min.js"><\/script>')</script><script src="/docs/4.5/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script></body>
=======
<footer class="text-muted">
<div class="container">
<p class="float-right">
@ -324,5 +261,5 @@
<script>let $ = require('jquery');</script>
<script>require('popper.js')</script>
<script>require('bootstrap')</script>
>>>>>>> origin/master
</html>

@ -26,8 +26,7 @@
.jumbotron h1 {
font-weight: 500;
color: rgb(90, 90, 90);
text-shadow: 0 0 4px rgba(0, 0, 0, 0.5);
}
}
.jumbotron .container {
max-width: 40rem;

@ -1,5 +1,9 @@
$theme-colors: (
"primary": #aa00ff
"primary": #103171,
"secondary": #878787,
"success": #099f4a,
"info": #93C5D3,
"warning": #FFB71C
);
@import "node_modules/bootstrap/scss/bootstrap";

Loading…
Cancel
Save